Added models and resource models
Merge remote-tracking branch 'origin/master'