NOJIRA Changed "research" to "citizen science", Modified CSS to display calendar correctly.
Merge branch 'master' of https://github.com/hart404/newmscwebsite.git

Conflicts:
	newmscwebsite/application.properties