Hotfix - collision bug due to bad merge
Merge branch 'master' of https://github.com/fabiopicchi/spjam-catavento-2014

Conflicts:
	Source/StageState.hx