ticket 6: added --clear to collectstatic trying to make css editions work
Merge remote-tracking branch 'origin/master'