Editted user model
Added some javadoc comments
Edited checkstyle