WATERSMART-378
* Adding colors for chart per Marty's suggestion, may need tweaking or reordering
Merge branch 'master' of github.com:USGS-CIDA/nwc
WATERSMART-426
* Added explicit "proxy" to context for all proxied calls to avoid url conflicts
Revert "WATERSMART-378"

This reverts commit 1ac755b4eb4cb9e1bcd48930c2bcfdda3e334915.
Merge pull request #145 from jiwalker-usgs/WATERSMART-426

Watersmart 426