core data and parse modifications
fixed parse and core data issues
fixed merge issues
Merge pull request #10 from gatropino/master

Fixed parse and core data issues