#12 Added ability to view upcoming events for a room on its detail view
Link on the overview points to the detail view yet
Merge remote-tracking branch 'remotes/origin/master' into feature/#12
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
Reverted linking to rooms & events to old style
Merge pull request #2 from SvenLehmann/feature/#12

Reverted linking to rooms & events to old style
merge dev into feature/#22