toc
toc
Merge remote-tracking branch 'origin/master' into Dev-jsomerville

Conflicts:
	basicviewer/src/modules/core/configuration/app.js