working on admin of content types
working content types
merged conflicts with content types