trying to merge master into livestock
removing bug where point legend was duplicated on product change
more merging and null handling
fixing bug forcing livestock to go to density values and other merge updates