Fix merge.

Conflicts:

	subscription/views.py
Merge branch 'master' of github.com:siovene/django-subscription