Small scenechanges
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scenes/scene0.unity
	Assets/Scenes/scene1.unity