error log 4-19-2014
Merge branch 'site_fixes' of https://github.com/culturemesh/culturemeshdevteam
fixed tab stuff on admin panel, removed nbproject dir from git, readded bootstrap images("img" directory)
fixed tab stuff on admin panel, removed nbproject dir from git, readded bootstrap images("img" directory)
Merge branch 'master' of
https://github.com/culturemesh/culturemeshdevteam

Attempting to merge origin with site after Mikos' changes
merge with master