Merge branch 'master' of https://github.com/ikresoft/django-cas-ng

Conflicts:
	django_cas_ng/views.py