Another possible fix for script references
Merge branch 'origin/master'

Conflicts:
	Platformer/Assets/Scenes/MainScene.unity