Style
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
App will not start if db.model has type errors