Merge pull request #20 from shaladi/models

Updated models
fixed server import email settings bug