Merge branch 'vellum-requirejs' into hqstyle-merge+vellum-requirejs

Conflicts:
	corehq/apps/hqwebapp/templates/hqwebapp/base.html
Merge branch 'master' into vellum-requirejs
Merge remote-tracking branch 'origin/hqstyle-merge+vellum-requirejs' into vellum-requirejs
Merge branch 'vellum-requirejs' into vellum-requirejs+use-django-compressor