No secret key in development
Add correct fields to user model and field to check on recover
Fix root and edit user in admin
Fix promotion choice
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Fix promotion choice
  Fix root and edit user in admin
  Add correct fields to user model and field to check on recover
  No secret key in development