Updated prefab references to sprites
Refactored and updated prefabs
Merge remote-tracking branch 'origin/block-physics'

Conflicts:
	Assets/PlayerController/ControllerTest.unity