Merge branch 'dev' of github.com:webershandwick/try-theme into dev

Conflicts:
	dist/styles/main.min.css
	styles/layout.less
layout refactoring