Fix weight=0 in cluster shader
Merge branch 'master' into rc2
Merge branch 'master' into rc2
Merge branch 'master' into rc2
Merge branch 'master' into rc2
Update layer toggle  styles
Merge branch 'master' into rc2
Move heatmp intensity slider a few pixels over
Add partner logos to bottom of basic sidebar
Merge branch 'master' into rc2

Conflicts:
	js/app/Visualization/BasicSidebar.js
Merge branch 'rc2'