added Core Data stuff to view
Merge remote-tracking branch 'origin'
fixed bug