login changes
all features added
Merge branch 'jason' into 3divs-dev

Conflicts:
	public/js/lib/maps.js