#FEAT updated users
Merge branch 'dev_design' into develop