added coffee
fixed coffee sprite
Merge branch 'aries'

Conflicts:
	src/Game/SceneGame.js
images update
...
Merge branch 'aries'
fix
Merge branch 'aries'

Conflicts:
	res/HD/coffee.png
	src/Game/Coffee.js
	src/Game/LayerGameCoffee.js
	src/Game/SceneGame.js
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
Merge branch 'origin/aries'
Merge branch 'origin/Yingjie'
pause function partly finished
fix
Change game background, other images update
Merge branch 'origin/Yingjie'
Game Option and About Us backgroud update.