#12 and #13: CSS and HTML updates
Merge branch 'frontend_implementation' into Development

Conflicts:
	app/views/calendar/edit.blade.php
	app/views/layout/master.blade.php