Building a cms

Updating master with the newest changes for Updating a CMS