Changes
Merge branch 'master' of https://github.com/androidheaven/server

Conflicts:
	go/worker/main.go