again cleanup
Primary User CUD feature. for issue #170, #171
Merge branch 'master' into admin
Merge branch 'admin'