Merge branch 'master' of https://github.com/gp6shc/SSK into development

Conflicts:
	config.codekit
	wp-content/themes/ssk/assets/css/theme.css
	wp-content/themes/ssk/assets/scss/.sass-cache/35c5ce43d71bb29227569848aef5fc8400d52d78/_audio.scssc
	wp-content/themes/ssk/assets/scss/vendor/_audio.scss
Merge remote-tracking branch 'origin/master' into development

Conflicts:
	config.codekit
	wp-content/themes/ssk/assets/css/theme.css
	wp-content/themes/ssk/assets/scss/.sass-cache/35c5ce43d71bb29227569848aef5fc8400d52d78/_audio.scssc
	wp-content/themes/ssk/assets/scss/vendor/_audio.scss