#12 Added ability to view upcoming events for a room on its detail view
Link on the overview points to the detail view yet
removed heroku deploy from travis.yml
Merge remote-tracking branch 'remotes/origin/master' into feature/#12
First version of #22. There is still missing the redirection, some unwanted db-fields are shown + Tests + other small things.
added notifications and adjusted redirect after room creation
adjusted tests for rooms_controller
#22 Now with working redirection, when creating/editing a roomProperty. Also set some unwanted DB-attributes invisible at the RoomProperty overview. Tests still missing.
#22 Updated/Wrote Tests. Everything passed. Travis should stop bitching around ;) Issue should be completed with that.
added field category in equipment

table equipment has new attribute “category” which shows the type of an
equipment (beamer, chair etc.)

reverted travis.yml
removed tabs in travis.yml
added schema.rb

migration was missing
Merge branch 'dev'
Merge remote-tracking branch 'remotes/origin/dev'
Merge remote-tracking branch 'remotes/origin/master' into feature/#12
#12 Added event view for rooms
#12 Added method to return upcoming events uniformly
Merge pull request #1 from SvenLehmann/feature/#12

#12 List upcoming events for a room
Merge pull request #60 from SvenLehmann/master

added field category in equipment
Reverted linking to rooms & events to old style
Merge pull request #2 from SvenLehmann/feature/#12

Reverted linking to rooms & events to old style