#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
First version of #22. There is still missing the redirection, some unwanted db-fields are shown + Tests + other small things.
#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.
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
Merge pull request #3 from SvenLehmann/feature/#22

Feature/#22
Merge pull request #4 from hpi-swt2/Dolphins

Dolphins
Merge remote-tracking branch 'remotes/origin/master' into dev
#12 Display message if no upcoming events available
Merge pull request #5 from SvenLehmann/feature/#12

#12 Display message if no upcoming events available
Merge pull request #6 from SvenLehmann/dev

merge #12 and #22 into master (preapproved)
Merge pull request #69 from SvenLehmann/master

synchronizing