Adds some javadoc for username and implements view to display location
Fixed merge conflict