Merge branch 'master' into develop
add the refactor changes from master
Merge branch 'develop' of github.com:kevinroberts/bandbot into develop
Added famfamfam icons css
Got rid of config for uninstalled plugin
login gsp adjustment
Merge branch 'develop' of github.com:kevinroberts/bandbot into develop
merging from home development work
added bandbot app styles and adjusted main layout