fixed the category control styling on form
Added cancel button on 'confirm-location-control'
Fixed 'feedbar' overflow
Added 'locate me' button
Added 'cancel' button on verify location step
Copy fixes for the labels
Added 'current-location-indicator'
Resized the map pointer
Merge branch 'develop' into base-from-develop

Conflicts:
	client/template/locate-control.html
Nudge the locate control a little bit
Merge branch 'base-from-develop' into test
Major update. Improved flow of confirm control.