django
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	requirements.txt
Merge remote-tracking branch 'origin/develop' into develop