Updates from Peter, to add e/n columns to square table when creating squares via admin-squares.php - and sort out redirect loop in accessing admin pages
Merge branch 'master' of github.com:barryhunter/geoportal

Conflicts:
	admin-setup.php