Merge updates to Stratus - support live editing#835

chadwickmeyer merged 2 commits into

Sitetheory:masterSitetheory/stratus:masterfrom

chadwickmeyer:masterchadwickmeyer/stratus:masterCopy head branch name to clipboard