merging updates
Merge branch 'master' of https://github.com/PaulKinlan/WebDocs

Conflicts:
	src/site/the-essentials/multi-device-layouts/layout-basics/index.markdown
Updates to prettify