Added users view
Added user-edit
Merge branch 'master' of https://github.com/kfs/deliveryservice
Modified UserController
Added user angular part
Merge branch 'master' of https://github.com/kfs/deliveryservice