#28 working on the translation files
Merge branch 'language_switch' into Development

Conflicts:
	app/views/calendar/create.blade.php
	app/views/calendar/eventDetail.blade.php
	app/views/calendar/index.blade.php
#30 Fixed active page indication in side navigation
Merge branch 'frontend_implementation' into Development

Conflicts:
	app/views/calendar/create.blade.php
Added create calendar form (removed because of conflict)
no message
Merge branch 'languages' into Development
#16 Exports for both filetypes supported, also added ability to share these links
Merge branch 'Development' of https://github.com/oSoc14/code9000 into Development
Small link fix to About page
Small css fix
Merge branch 'Development' of https://github.com/oSoc14/code9000 into Development