images update
Merge branch 'origin/aries'
...
Merge branch 'aries'
lite lite
fix some small stuff
Merge branch 'origin/aries'
option and its navigation fixed
Fixed bug with different sprites of bacteria
Rotating medicine
Merge branch 'JOY'
iamges update
Merge branch 'aries'

Conflicts:
	src/Game/Bacteria.js
	src/config/BacteriaType.js
fix
Change game background, other images update
Game Option and About Us backgroud update.
Add About Us page.
...
Coffee animation
Merge branch 'Yingjie'

Conflicts:
	res/HD/coffee.png
	res/HD/coffee_normal.png
	src/Main/LayerMainMenu.js
	src/Option/LayerOptionMenu.js