fix models, semi complete khadem
Merge branch 'master' of github.com:Soben713/shametara