Merge branch 'connectors'

Conflicts:
	connectors/config/pme_ui.js