with solr dir this time
Merge branch 'master' of https://github.com/kennyszub/ftcalendar

Conflicts:
	solr/development/data/index/segments.gen
	solr/pids/development/sunspot-solr-development.pid