Merge remote-tracking branch 'origin/master'

Conflicts:
	asympleplatformer/asympleplatformer.userprefs
Clouds, spike active
Merge remote-tracking branch 'origin/master'

Conflicts:
	asympleplatformer/Assets/test_scene.unity