rewrite static folders in template to use modern template tags
Merge remote-tracking branch 'origin/development' into development