[OE-4007] bugfix
Merge branch 'develop' of github.com:openeyes/OphTrOperationnote into develop

Conflicts:
	assets/js/module.js