Minor scene changes
merging changes

Conflicts:
	Assets/Scenes/GameScene.unity