Merge branch 'staging' into templating
add reports in menu
translating
Merge branch 'staging' into templating
translating wizard
Merge branch 'staging' into templating
#contact edit
#contact edit
Merge branch 'staging' into templating
#contact edit
translating wizard
Merge branch 'staging' into templating
#contact share
translating wizard
Merge remote-tracking branch 'origin/templating' into dev-master
Merge remote-tracking branch 'origin/templating' into dev-master
#dashboard
#contact edit for all