User adding, updating, deleting and viewing
Merge remote-tracking branch 'origin/dev-deam'