Conflicts:
	snf-astakos-app/astakos/im/context_processors.py
	snf-astakos-app/astakos/im/forms.py
	snf-astakos-app/astakos/im/models.py
	snf-astakos-app/astakos/im/target/local.py
	snf-astakos-app/astakos/im/target/shibboleth.py
	snf-astakos-app/astakos/im/urls.py
	snf-astakos-app/astakos/im/views.py