User updated with new equals-method. Id changed from Long to long.
Merge branch 'master' of https://github.com/ehannes/webapp.git