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

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