Styleguide changes & lab template
Merge branch 'master' of https://github.com/geckotree/_boilerplate

Conflicts:
	assets/css/dev/style-ie.css
	assets/css/dev/style.css
	assets/css/production/style.min.css