Scene are working again
Merge branch 'master' of github.com:xaqq/tp1

Conflicts:
	ProjectSettings/QualitySettings.asset