merge changes
Merge branch 'master' of github.com:kennyszub/ftcalendar

Conflicts:
	coverage/.resultset.json
	coverage/index.html
	solr/development/data/index/segments.gen
Merge branch 'master' of github.com:kennyszub/ftcalendar

Conflicts:
	app/views/events/new.html.haml~