Merge branch 'master'
a
by aries
Merge branch 'Yingjie'
Rename everything according to meeting
Fix
1
dev
private
trac
private
w
Some more updates
Adding BGM
Added sound control
Merge branch 'origin/aries'

Conflicts:
	cocos2d.js
	main.js
	src/Game/Bacteria.js
	src/Game/SceneGame.js
made some changes on Bacteria