Offer wizard works with JSON session serializer
Add note to release doc on Django 1.6 support
Merge pull request #916

Conflicts:
	.travis.yml
	requirements.txt
	tox.ini
merge