Merge branch 'origin/Yingjie'

Conflicts:
	src/About/SceneAbout.js
smas
collision fixed
Merge branch 'origin/JOY'

Conflicts:
	src/About/SceneAbout.js