Work on placeholder level
Fixing weird collision bug with going through doors.
Merge branch 'master' into placeholderLevel

Conflicts:
	Assets/Scenes/choreoTesting.unity