CMS-2078 Let ContentType be persisted as an Node

Fixed stuff that didnt work, obviously