Fixing merge.
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/solrManager.coffee