Tweaks to solr process handling to allow running under Windows
Merge branch 'master' of github.com:phgrads/SceneStudio

Conflicts:
	config/initializers/delegate_servers.rb