Merge branch 'master' into packaging

diff --cc snf-astakos-app/astakos/__init__.py
Simple merge

diff --cc snf-astakos-app/astakos/im/forms.py
Simple merge

diff --cc snf-astakos-app/astakos/im/settings.py
Simple merge

diff --cc snf-astakos-app/astakos/im/templates/registration/password_email.txt
Simple merge

diff --cc snf-astakos-app/astakos/im/util.py
Simple merge