Fix format of UserModel
Refactor username to userName
Update UML models
Started work with gson to save comments.