Merge branch 'editing' into editing-view-draft-content
undo HTML that was injected in models/contents/page
move query code that sprinkles functionality
Merge pull request #379 from Connexions/editing-html-content

EDITING: Aloha uses the original HTML for editing