Merge origin/master

Conflicts:
	dist/css/action-template.min.css
	dist/css/article-template.min.css
	dist/css/form-test.min.css
	dist/css/normalize.min.css
	dist/css/typography-test.min.css
	dist/js/page.js
	src/css/action-template.css
	src/js/action-template-main.js
	src/less/pages/_action.less