Merge branch 'master' of github.com:liuheng/byp

Conflicts:
	worker/buildstep.py
	worker/conf.py
dyn commit without buildstep