add and remove users
Merge branch 'dev-02-local'