CR-127: First round of changes resulting from model code review.
CR-127: First round of changes resulting from model code review.
CR-127: renaming models and collections to remove 'model' and 'collection' from their names since they name is redundant with their directory structure.
CR-127: renaming widget states collection.
Merge branch 'master' of https://github.com/ozoneplatform/ozp-commons into cr127
Merge branch 'master' of https://github.com/ozoneplatform/ozp-commons into cr127
Merge branch 'master' of https://github.com/ozoneplatform/ozp-commons into cr127
Merge branch 'master' of https://github.com/ozoneplatform/ozp-commons into cr127
Merge branch 'master' of https://github.com/ozoneplatform/ozp-commons into cr127