UI edits, updates to dummy data/fixtures
Merge branch 'master' of https://github.com/chamarapaul/ClassCartography

Conflicts:
	web-app/css/global.css