interop
proxy
tools
ago
toc
Merge remote-tracking branch 'origin/Dev-ssporik'

Conflicts:
	basicviewer/src/css/ie.css
Update ie.css
cap budg test
Merge remote-tracking branch 'origin/Dev-jsomerville'
styles
toc
toc
toc
Merge remote-tracking branch 'origin/master' into Dev-ssporik

Conflicts:
	basicviewer/src/css/ie.css
	basicviewer/src/modules/core/configuration/app.js
	basicviewer/src/modules/core/toc/btnbar.js
	basicviewer/src/modules/core/toc/legend/TOC.js
	basicviewer/src/modules/core/toc/legend/css/TOC.css
	basicviewer/src/modules/core/toc/toc.js
	basicviewer/src/modules/core/utilities/maphandler.js