Prevents picking up pots after they've broken
Fixes player lock in midair on hurt
Fixes double bouncing on web in black-caverns
weapon faster attacks
Merge pull request #858 from NimbusBP1729/weapon_tweaks

weapon faster attacks
Fixes #860
Merge branch 'master' of github.com:kyleconroy/hawkthorne-journey
village forest
Merge pull request #865 from didory123/treeline

village forest
Wall / Floor merge for Village-Forest
Merge branch 'master' into floor_wall_cleanup

Conflicts:
	src/maps/village-forest.tmx