pages
Merge branch 'master' of https://github.com/askaza/golden-string_design

Conflicts:
	code/css/components.less
	code/css/styles.css