core data stuff done
Merge branch 'master' of github.com:gBit/thePeanutGallery