xiangbo
Merge branch 'master' of https://github.com/angiebird/SMG_Platform

Conflicts:
	platform.html
	platform.js