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