Changed to use Scene objects separated
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/scripts/config/gameConfig.js
Changed to use Scene objects separated