reset to 9794709478619a58ceca21f51e2622f90cb536af
Merge branch 'master' into v1.0

Conflicts:
	.gitignore
	README.rst
	example/example/settings.py
	example/example/urls.py