Merge / cleanup of wall / forest layers -> block
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