last Django version
Merge branch 'master' of https://github.com/cschaffner/spirit

Conflicts:
	requirements.txt