Production build and commit
Merge branch 'dev'

Conflicts:
	.dist/css/style.css