updated models
correct settings
Merge remote-tracking branch 'origin/master'
base template