scoping and reindenting
Merge branch 'master' of github.com:USGS-CIDA/nwc into WATERSMART-358
Merge pull request #94 from isuftin/master

Removed free-floating text
Using newer dynamic properties, will release that soon
Merge branch 'master' of github.com:USGS-CIDA/nwc
WATERSMART-362
* moving provisional into parent template
* removing it from button since it is duplicate
WATERSMART-369
* created caution class which makes text red and bold
* added caution class to em so it is italic, red, and bold
Merge pull request #97 from jiwalker-usgs/WATERSMART-369

WATERSMART-369
WATERSMART-364
* changed imperial to usCustomary in conversion util
* changed uses of conversion to use usCustomary
* changed text on button to US Customary
Merge pull request #96 from jiwalker-usgs/WATERSMART-362

Watersmart 362
WATERSMART-364
* fixed broken test, thanks Sibley
Merge pull request #98 from jiwalker-usgs/WATERSMART-364

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

Conflicts:
	src/main/webapp/client/nwc/general/services/SosSources.js
WATERSMART-366
* added BETA notice
* tooltip on title
* well on front page
Merge pull request #99 from jiwalker-usgs/WATERSMART-366

WATERSMART-366
WATERSMART-363
* Added button to show streamflow plot
WATERSMART-363
* Changed some layout
* hiding button when observed
Got ma9 in and fixed duplicate ma20.
Merge branch 'master' of https://github.com/USGS-CIDA/nwc
WATERSMART-363
* show loading spinner