Added UI for color selection and thresholding.
Merge pull request #540 from apartensky/master

Probe Annotations - initial release
Added transition for color change on selected color update.
Added multiple color options. fixes #548
Merge remote-tracking branch 'dfci-mev/master' into settings-addition
Merge pull request #550 from jfarid27/settings-addition

Addition of settings menu
Fixes infinite loop on AbstractHcl.toString()
Added closed top and left margins and expansion on heatmap tree creations.
Fixed color selections property. fixes #552
Fixed analysis proxy issue causing incompatible format errors for
analyses. Fixes #549
Merge remote-tracking branch 'upstream/master'

Conflicts:
	dataset/rest/src/main/java/edu/dfci/cccb/mev/dataset/rest/configuration/DatasetRestConfiguration.java
Merge pull request #553 from lev-kuznetsov/master

Merging up fixes
Merge remote-tracking branch 'dfci-mev/master' into margin-fixes
Removed margin updates for now.
Setting tmpdir for prod
Merge pull request #554 from jfarid27/margin-fixes

Margin fixes
Merge pull request #555 from lev-kuznetsov/master

Setting tmpdir for prod
Adding prod path to RScript
Merge pull request #556 from lev-kuznetsov/master

Adding prod path to RScript
Fixed disconnect for RScript configuration