This has fixed some issues but there are still some
Merge needed for game.unity - Ask Alisdair (May be reverted)

Conflicts:
	Assets/Scenes/Game.unity

Alisdair: Conflict possibly caused by my earlier merge?