Merge branch 'inline-js-preview'

Conflicts:
	classes/styles-customize.php