Changing around towns and the shrine to use new tiles
Merge branch 'master' of https://github.com/psywombats/mgne

Conflicts:
	saga/res/maps/world1/parish.tmx