Fix issue in save/add assessment
Merge branch 'localdev' into dev