added event fields and updated form
Merge branch 'feature/event-create' into dev
created event templates CRUD basics ref #24
removed heroku deploy from travis.yml
Users can only edit, delete and update their own events
Merge branch 'feature/edit-own-events' into dev
fixed tests
create event from template, template list view
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 branch 'feature/template-crud' into dev
Merge remote-tracking branch 'sven/master'
Merge pull request #1 from DasDingGehtNicht/dev

merge DB-Schema from Clownfish concerning events and event-templates
merged schema from clownfish and dolphins
#45: added rooms/list
#45: added List for rooms with size selection
added basic functionality to se details of a room