changes to django-rest-framework, added python2-webassets and django-assets
Merge branch 'master' of https://github.com/dekoza/AUR

Conflicts:
	django-rest-framework/PKGBUILD