Fixed core data properties
Merge branch 'master' into CoreData
Merge pull request #2 from kpham13/CoreData

Core data