side-by-side
Merge branch 'connectors' of https://github.com/proquest/PME into connectors

Conflicts:
	connectors/pme/translate.js