Added several models and created associations
Merge branch 'models'