Merge branch 'release/20140303' into develop
Back merging a few changes made from Master
ccfield actually bccfield, commented out some build.gradle options, and removed a trailing div closing tag from groupReport.html template
Merge branch 'release/20140324'
ccfield actually bccfield for now
commented out some build.gradle options (testing and mysql)
and removed a trailing div closing tag from groupReport.html template