Edit Username
Merge remote-tracking branch 'origin/master'
Finished UI and GET WebSErvice
Merge remote-tracking branch 'origin/master'