Adding core data methods, and json for test.
Removing ghost reference.
Merge remote-tracking branch 'origin/master'
Solving problems with merge conflict, committing.