added coffee
fixed coffee sprite
Merge branch 'aries'

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

Conflicts:
	res/HD/coffee.png
	src/Game/Coffee.js
	src/Game/LayerGameCoffee.js
	src/Game/SceneGame.js
extra animation is added to falling coffees.
Coffee pic fixed.
About Page added.
vjkgghjk
added back button to option menu layer in my branch by copy-pasting joys code
.
Merge branch 'Yingjie'
bnk
fixed smalkl bugs
Coffee animation
Merge branch 'Yingjie'

Conflicts:
	res/HD/coffee.png
	res/HD/coffee_normal.png
	src/Main/LayerMainMenu.js
	src/Option/LayerOptionMenu.js
Merge branch 'sercan'
Merge branch 'aries'

Conflicts:
	src/About/LayerAboutBg.js
	src/About/SceneAbout.js