Use new integrated forms
Show api-key here for authenticated user
Merge reset-api-key in the update form
Add change password to update endpoint
Scrolldown to errors
Merge user profile changes in one place
Hide passwd_form when user signed in with a Social Network
Merge pull request #32 from PyBossa/issue-785-account-update-form

Issue 785 account update form
Merge branch 'master' into issue-686-creating-an-application

* master:
  Hide passwd_form when user signed in with a Social Network
  Merge user profile changes in one place
  Scrolldown to errors
  Add change password to update endpoint
  Merge reset-api-key in the update form
  Show api-key here for authenticated user
  Use new integrated forms

Conflicts:
	templates/account/update.html