added first version of calendar
fixed css problem
removed calendar rendering on events side
Merge branch 'dev' into d/feature/#114

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/views/events/_calendar.html.erb