Rewrite Rule: /assets/addons/  redirect to TEMPLATE-DIR/addons/
Merge addons into development
Commit before code cleaning