Add Calender
Merge pull request #13 from hestervanwijk/master

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

Conflicts:
	app/controllers/meeting_controller.rb
Merge pull request #15 from hestervanwijk/master

Fix a dependency and small fixes
removed duplicate event def