player and plane.js loaded in loader
Merge branch 'master' of https://github.com/Stoney-FD/zombieloveaffair
merged
Merge branch 'master' of https://github.com/Stoney-FD/zombieloveaffair

Conflicts:
	style/scenes.less