Add some logic for overlapping of enabled layers
Merge branch 'master' of https://github.com/zorgame/zorjs

Conflicts:
	js/Game.js
	js/PlatformSpawner.js