changed models, added to server settings for using models
Merge remote-tracking branch 'origin/master'