Update MapGen:
	New: -Margins from water to grass now possible
	Fix: -Generating buildings now checks for grass and grass2
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'