Merge branch 'origin/aries'
Merge branch 'origin/Yingjie'
pause function partly finished
Merge branch 'origin/Yingjie'
。
Merge branch 'origin/Yingjie'
small changes
3
smsms
Merge branch 'origin/JOY'

Conflicts:
	src/About/SceneAbout.js