Fixed creation of new users
Merge branch 'fix_new_user'
Merge branch 'master' into kairosdb