Conflicts:
	snf-astakos-app/astakos/im/activation_backends.py
	snf-astakos-app/astakos/im/api/admin.py
	snf-astakos-app/astakos/im/auth_backends.py
	snf-astakos-app/astakos/im/forms.py
	snf-astakos-app/astakos/im/functions.py
	snf-astakos-app/astakos/im/management/commands/group-list.py
	snf-astakos-app/astakos/im/management/commands/invitation-list.py
	snf-astakos-app/astakos/im/management/commands/service-list.py
	snf-astakos-app/astakos/im/management/commands/user-add.py
	snf-astakos-app/astakos/im/management/commands/user-list.py
	snf-astakos-app/astakos/im/middleware.py
	snf-astakos-app/astakos/im/models.py
	snf-astakos-app/astakos/im/settings.py
	snf-astakos-app/astakos/im/target/local.py
	snf-astakos-app/astakos/im/target/redirect.py
	snf-astakos-app/astakos/im/target/shibboleth.py
	snf-astakos-app/astakos/im/urls.py
	snf-astakos-app/astakos/im/util.py
	snf-astakos-app/astakos/im/views.py
	snf-astakos-app/conf/20-snf-astakos-app-settings.conf~