Move map to sidebar, make payment pg official, change links bc of unnesting Diana did, fix Emailable in preregs
Merge branch 'master' of https://github.com/ddgriffin/GG-mvp

Conflicts:
	app/views/apprenticeships/_xedit.html.haml