server zeugs
Merge branch 'master' of https://github.com/CelebritySearch/CelebritySearch

Conflicts:
	solr/logs/solr.log