Editing User

Signed-off-by: Shabri Nur <shabri.nur.ilmi@gmail.com>
Merge remote-tracking branch 'origin/master'