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

Conflicts:
	basicviewer/src/modules/core/configuration/app.js
toc
toc
toc
Merge remote-tracking branch 'origin/master' into Dev-jsomerville

Conflicts:
	basicviewer/src/modules/core/configuration/app.js
Merge remote-tracking branch 'origin/master' into Dev-jsomerville
ago
Merge remote-tracking branch 'origin/master' into Dev-jsomerville
Merge remote-tracking branch 'origin/master' into Dev-jsomerville
toc titles
locator
Merge remote-tracking branch 'origin/Dev-jsomerville'