Some client/user changes:
Merge branch 'master' of github.com:ctdk/goiardi-schema