Stumps and Collisions
Merge branch 'master' of https://github.com/smoss/enoru-eco

Conflicts:
	game/data/ortho_trees_map.tmx
merge'd