#429
Merge branch 'staging' into templating
add reports in menu
translating