Pulled down update to Bonita, lots of content creation changes
Further content creation changes