fixed errors
Merge branch 'issue/#582'

Conflicts:
	wp-content/themes/glp/config.codekit