Merge remote-tracking branch 'upstream/master' into feature/js-refactor

merging Model changes
Tri-state category checkbox
cleanup
default weighted overlay opacity is now 0.6
starting map zoom +1
View Region button resets map zoom and center