Merge branch 'master' of https://github.com/Assiance/Observer

Conflicts:
	Observer/Assets/Scenes/BradTestScene.unity