Fixed minor errors
Merge branch 'master' into develop
update the models
Updated the store class used to access coredata models