fixing dependencies and model inheritance references from old code
Merge branch 'master' of github.com:Covetel/Gap_Analysis_Covetel