Merge branch 'feature/design_bug_43' into develop
Design bugs fixed.
Merge branch 'feature/44-design-bugs' into staging

Conflicts:
	app/assets/stylesheets/mania-style/custom.css