Nicer looking edit profile; cancel saving edit?

cancel saves the profile edit for some reason
Merge remote-tracking branch 'origin/master'

Conflicts:
	test/public/modules/core/views/home.client.view.html

	test/public/modules/users/views/settings/change-password.client.view.html
	test/public/modules/users/views/settings/edit-profile.client.view.html