added user model specs
Merge branch 'master' into chantal