Change to Phaser's state system.
Merge branch 'master' into mainMenu

Conflicts:
	index.html