fixing glitches found; on print, legend tooltip
Merge remote-tracking branch 'upstream/development' into neuromlWidget

Conflicts:
	src/main/webapp/js/main-built.js
fix main-built conflict