Pass the update and avatar forms to the account/settings view
Fix
Fix
Modifications to merge with master
Fix
Merge branch 'master' into modifications-in-account

* master: (26 commits)
  Add documentation
  Only delete avatar if the user has one
  Fix typo. Closes #758
  Enable DebugToolBar from settings file
  Instal DebugToolbar
  Fix CSRF for reset key
  Use new CSRF protection
  Fix library
  Refactor
  Fixes for the module
  Use new CSRF token for uploader customized forms.
  Install dependencies when testing
  Remove unnecessary libraries
  Use new Flask-WTF to support CSRF protection in customized forms
  Use new Flask-WTF
  Fix typo
  ignore
  Include a default rank for users that have not contributed
  Remove comments
  Ignore sql files
  ...

Conflicts:
	pybossa/view/account.py
Added changes from master regarding deletion of previous user avatar
Merge pull request #767 from PyBossa/modifications-in-account

Pass update and avatar forms to settings.html template