b commit
Merge branch 'master' of https://github.com/xiaozhujun/platform

Conflicts:
	readme.txt