Merge branch 'coreData'
Merge branch 'master' into coreData
Added more entities
added more core data functionality
Merge pull request #2 from gatropino/coreData2

Core data2