Updates to latest versions, specifically Django
Merge branch 'master' into python3

Fixed Conflicts:
	requirements/base.txt