content authoring feature
Merge branch 'master' of github.com:jswitchback/dsawm