few changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Src/GameLayer.js
	Src/config/GameConfig.js
	Src/resource.js