fixed bug where maxinet was not shut down correctly
Merge branch 'master' of github.com:MaxiNet/MaxiNet

Conflicts:
	Worker/bin/worker_manager.py