changed content model name to avoid conflicts
merged
added permissions
collation display, stubs for creation
moved some stuff around
moved admin
changed admin
added sample more sample data
moved utiltiy function
Update calliope.inc

Pulled old comment.
Merge pull request #4 from ajstanley/7.x

changed content model name to avoid conflicts