edit land
Merge branch 'jairus_branch' of https://github.com/jairus/pieceoftheworld

Conflicts:
	index.php