Merge branch 'master' of https://github.com/yaozhuan/siseplatform

Conflicts:
	README.md
Merge branch 'master' of https://github.com/yaozhuan/siseplatform

Conflicts:
	README.md