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 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