April 22, 2014
Merging in  fixes to earlier pull request
Merge branch 'seattlemark-master'

Conflicts:
	assets/css/style.css
	templates/dynamicpages/allstudies.twig
	templates/layoutloggedin.twig
	templates/layoutloggedout.twig