update progress of task erd to 40
Merge branch 'develop' into erd