Merge pull request #6 from niallfallon/content

Content edit
Merge remote-tracking branch 'origin/master' into content