#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