Merge remote-tracking branch 'origin/master'

Conflicts:
	partials/cms/section_main.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	partials/cms/section_main.js