removed *.orig files that were generated as a result of merging model->master branch yesterday