master:
1) CoreData classes added