added user model
Merge branch 'master' into visor-experiment