More on how the pages look
Added button to change password

Cancel button "works", but not properly
Merge remote-tracking branch 'origin/master'

Conflicts:
	test/app/controllers/users/users.create.server.controller.js
	test/public/modules/users/views/settings/edit-profile.client.view.html