more models
more models2
adds user model
Merge branch 'develop'