Layout changes to lots of pages (PHTML/JS/CSS)
Merge branch 'fetemplates' of https://github.com/oSoc13/Code9000 into fetemplates

Conflicts:
	scripts/cityprop.js
	scripts/spot.js
	scripts/spots_all.js
	scripts/spots_user.js
	templates/account-edit.phtml
	templates/cityprop.phtml
	templates/cityprops.phtml
	templates/spot.phtml
	templates/spots_user.phtml