Merged Date and time to datetime field
added translations
Merge branch 'dev' into Clownfish

Conflicts:
	app/assets/javascripts/rooms.js
	app/assets/stylesheets/rooms.css
	app/models/event.rb
	db/schema.rb
ignoriere .orig Dateien
Merge branch 'Clownfish' into dev