Some changes to CoreData model
Merge branch 'chris' into dennis