QA Branch with older version of sherdjs
Merge remote-tracking branch 'upstream/qa' into appsembler_develop

Conflicts:
	mediathread/assetmgr/views.py