Merge branch 'hotfix/dashboard_configuration' into develop
Merge branch 'hotfix/notification_widget_fix' into develop
Permission fix
Merge branch 'develop'