Merge branch 'test'
Merge branch 'test'

Conflicts:
	update.sh
house marker
swap render and genpoi order
portal signs
points of interest
Merge branch 'master' of github.com:stwalkerster/minecraft-overviewer
overlay directions
Merge branch 'master' into test