重新打版本
Merge branch 'master' of github.com:brucexx/heisenberg

Conflicts:
	assembly/bin/startup.sh