Clean rebase from master

add castle hawkthorne entrace level, reorganize village forest and
forestcave levels

Conflicts:
	src/images/tilesets/village-forest.png
	src/maps/village-forest.tmx
	src/overworld.lua
Makes real floorspace at castle entrance
Castle hawkthorne entrance, castle hawkthorne, castle hawkthorne throne
levels added; modifications to winter wonderland and frozencave regarding
parallax; added secret, WIP doorway in forestcave
polygon fixes
Merge branch 'master' into didory_castle_entrance

Conflicts:
	src/maps/forest-2.tmx
	src/maps/village-forest.tmx
	src/overworld.lua
Merge pull request #3 from jhoff/didory_castle_entrance

Didory castle entrance
Fix lava spewers
Remove wrong tile
Fixes some doors so you can get back to seabluff
Merge pull request #853 from kyleconroy/castleh

Add Castle Hawkthorne