Conflicts: EditorialModel/classes.py EditorialModel/fields.py EditorialModel/fieldtypes.py EditorialModel/types.py