updates
Merge branch 'master' of github.com:nive/nive_userdb