implemented feature #44
Merge pull request #126 from hpi-swt2/dev

merge dev into Dolphins
renamed title from approve events
Added column is_important to event
added field is_important to views: view, edit and create
added first version of calendar
merged master in Elch
Added important tag in requested bookings
Updated link to requested bookings in header
create seeds for users, events, tasks
create partial
get tasks end events for user, filtered
partly fix tests
fixed css problem
Merge pull request #136 from hpi-swt2/dev

Dev
removed calendar rendering on events side
merged from fork svenlehmann
Merge branch 'dev' into d/feature/#114

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/views/events/_calendar.html.erb
fixed conflicts, remove require application js form application.html, due to multiple requiring
only show events, which are created by current_user & mark non-approved events red
implemented feature #46
Merge branch 'Elch' into E/feature/#100

Conflicts:
	db/schema.rb
Merge branch 'Elch' into E/feature/#49

Conflicts:
	db/schema.rb