Update
Merge branch 'industry-pages' into develop

Conflicts:
	wp-content/plugins/global-translator/debug.log
Plugin updates.
Merge branch 'develop'