added notifications and adjusted redirect after room creation
adjusted tests for rooms_controller
Added many_to_many relationship for rooms and room_properties
Room properties can be edited
Merge remote-tracking branch 'remotes/origin/dev' into feature/#23

Conflicts:
	config/locales/views/room.de.yml
Merge pull request #7 from hpi-swt2/Dolphins

merge authentification into dolphins fork
Merge pull request #8 from SvenLehmann/master

Merge master into dev
Merge branch 'master' into feature-10
implement authorization for equipment & rooms, closes #10 , closes #17
Merge pull request #9 from hpi-swt2/Dolphins

synchronizing of main repo and dolphins fork
Merge pull request #10 from SvenLehmann/master

merge master into dev
removed column for actions in equipment table for non-admins
Merge branch 'feature-10' into dev
TestHelpers only are included for controllers
Rooms don't use bookings anymore
added partial for upcoming events
Merge remote-tracking branch 'remotes/origin/feature/#23' into feature/#12

Conflicts:
	app/models/room.rb
	db/schema.rb
	test/controllers/rooms_controller_test.rb
	test/models/room_test.rb
db migrate
Small UI tweak for #23
Reverted admin identity
Merge pull request #11 from SvenLehmann/feature/#12

Merge fixes for #12 and part of #23
Feature 31 (maps)

Initial commit for maps