Merge branch 'origin/aries'
Merge branch 'origin/Yingjie'
pause function partly finished
Merge branch 'origin/Yingjie'
....
......
Merge branch 'aries'

Conflicts:
	src/About/LayerAboutBg.js
	src/About/SceneAbout.js
。
fix about page
Merge branch 'origin/Yingjie'
Game background update
small changes
Make bacterias and doctors smaller
3
smsms
Merge branch 'origin/Yingjie'

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

Conflicts:
	src/Game/Bacteria.js
	src/config/Level.js