Merge branch 'master' into grnetstyles
Conflicts: astakos/im/context_processors.py astakos/im/templates/account_base.html astakos/im/templates/invitations.html astakos/im/templates/registration/password_change_form.html astakos/im/views.py
Fixed admin base template to use old bootstrap styles
Remove accepted flag (change to consumed) and invitation login target.
fix admin logout
Set cookie and delete cookie and other minor changes.
Several minor changes
Change twitter & shibboleth views to accept an email request parameter to associate with the user
prepare response set user email instead of username
minor changes/fixes
fix password_reset email link & subject
Refs: #1935
View revisions
Also available in: Atom