Stubbing Content.
Stubbing content/layouts etc.
Merge branch 'content'