Merge proposals dependent on lp://staging/~webteam-backend/webteam-django-extension/assets-template-context

1. assets-template-context
2. Dependent merge proposals