working on admin of content types
adding content types
working content types
merged conflicts with content types
adding missing public files
updated admin
Merge pull request #5 from yawetse/master

cleaning up admin