Added Django 1.7 support.
Merge branch 'master' of https://github.com/suselrd/django-catalog-wizard

Conflicts:
	setup.py