Django -> 1.6.5

tests break due to outdated fixtures, which I do not know how to upgrade
Merge branch 'django-1.6.5' of https://github.com/thraxil/mediathread into thraxil-django-1.6.5

Conflicts:
	requirements.txt