Merge branch 'rename_preprocessors' into master-dlamotte
Merge branch 'strip_root_from_dst' into master-dlamotte

Conflicts:
	src/static_compiler/management/commands/compilestatic.py
Merge branch 'make_collectstatic_work' into master-dlamotte