No null-pointer, yes music
More error fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/TestScene.unity