scoping and reindenting
Merge branch 'master' of github.com:USGS-CIDA/nwc into WATERSMART-358
Merge branch 'master' of github.com:USGS-CIDA/nwc into WATERSMART-358

Conflicts:
	src/main/webapp/client/nwc/general/services/SosSources.js
WATERSMART-363
* Added button to show streamflow plot
WATERSMART-363
* Changed some layout
* hiding button when observed
WATERSMART-363
* show loading spinner
WATERSMART-363
* added title to plot
WATERSMART-363
* missed the plotter service
Merge pull request #100 from dblodgett-usgs/master

Fix for stats descriptions.
Merge pull request #102 from dblodgett-usgs/master

Fix for mgd.
adding combination logic
Merge branch 'master' of github.com:USGS-CIDA/nwc into WATERSMART-358
removing cruft
Merge pull request #101 from jiwalker-usgs/WATERSMART-363

Watersmart 363
Merge pull request #103 from davidmsibley/WATERSMART-358

Watersmart 358
fixing math labels
Merge pull request #104 from davidmsibley/WATERSMART-358

fixing math labels
Merge pull request #105 from dblodgett-usgs/master

Modified header for water use downlad.
WATERSMART-372
* strip the http: from urls in context.xml
* put them back when posting WPS with urls from context.xml
* note: dev and qa will not work with https (you will get funny errors)
Merge pull request #107 from dblodgett-usgs/master

Tiny tweak to table description.