updated
Merge branch 'master' into coreData2
added parse framework
Merge pull request #6 from gatropino/coreData2

Core data2