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
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