made some server changes
Merge branch 'master' of https://github.com/dimzy/Harvester

Conflicts:
	HarvesterServer.py