added search
Merge branch 'master' of https://github.com/kennyszub/ftcalendar

Conflicts:
	app/assets/stylesheets/application.css.scss
	app/views/events/index.html.haml
	solr/development/data/index/segments.gen
	solr/development/data/tlog/tlog.0000000000000000000
	solr/development/data/tlog/tlog.0000000000000000001
	solr/development/data/tlog/tlog.0000000000000000002