improved 1.2.1
Merge branch 'master' of https://github.com/ifdm/siphon

Conflicts:
	Assets/Objects/Gameplay/Player.prefab