prepared for user.getId()
Merge branch 'develop' of github.com:knutesten/kad into develop