upgrade django to 1.7
Merge branch 'master' of https://github.com/bluedisk/orum

Conflicts:
	orum/settings.py
	orum/urls.py
	warehouse/admin.py
	warehouse/views.py