Ddasd
Merge pull request #151 from alaashafaee/dev_models

Dev models
Merge branch 'master' of https://github.com/alaashafaee/Coolsoft-14
Merging with erroneous master.
Further merge fixes..