merging
Merge branch 'master' of github.com:slackish/qrplay

Conflicts:
	server/worker/mondaemon.sh