User "nickname" changed to "username".
Merge branch 'master' of https://github.com/ehannes/webapp.git