Add Calender
Merge branch 'add-calender' of https://github.com/annikatol/railsgirls-nl into annikatol-add-calender

Conflicts:
	app/controllers/meeting_controller.rb