Reset originX on Surgeon doodle to avoid offset problem (resolves OE-3058)
Revert surgeon position fix as it causes other problems, and isn't complete anyway.
Merge branch 'master' into develop

Conflicts:
	js/ED_General.js