made some adjustments 1.3.2
Merge branch 'master' of https://github.com/ifdm/siphon

Conflicts:
	Assets/Graphics/Art/boulder-pooper/sprites.meta~HEAD.meta

Assets/Graphics/Art/boulder-pooper/sprites/boulderThrower_00014.png.meta
~HEAD.meta