Work in progress, sync...
Merge branch 'master' of https://github.com/ehannes/webapp.git
Merge branch 'master' of https://github.com/ehannes/webapp.git
Merge branch 'master' of https://github.com/ehannes/webapp.git
Updated hashCode, toString.