Layout cleanup
Merge branch 'Development' of https://github.com/oSoc14/code9000 into Development

Conflicts:
	app/views/calendar/create.blade.php
	app/views/calendar/edit.blade.php