Merge / cleanup of wall / forest layers -> block
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
Merge pull request #856 from jhoff/floor_wall_cleanup

Merge / cleanup of wall / forest layers -> block