Merge branch 'master' of https://github.com/USGS-CIDA/coastal-hazards
Merge branch 'master' of https://github.com/USGS-CIDA/coastal-hazards
Merge branch 'master' of https://github.com/USGS-CIDA/coastal-hazards
Did something weird undoing an accidental git stash pop. Just finished fixing the handling of changing all map layers on change of baseline selection
Merge branch 'master' of https://github.com/USGS-CIDA/coastal-hazards
ui propagation of state
Merge pull request #205 from isuftin/master

Results mgmt tab
name locking, workflow corrections
Merge branch 'master' of https://github.com/USGS-CIDA/coastal-hazards

Conflicts:
	coastal-hazards-n52/src/main/webapp/R/r_scripts/DSAS_stats.R
	coastal-hazards-ui/src/main/webapp/index.jsp
	coastal-hazards-ui/src/main/webapp/js/stages/results.js
Merge branch 'master' of https://github.com/isuftin/coastal-hazards
workflow updates. upstream ui changes blow away downstream changes.
Merge pull request #206 from cschroed-usgs/master

UI Workflow Updates
baseline smoothing
Merge pull request #207 from tkunicki-usgs/master

baseline smoothing
Second pass at transects/intersects editing/generation
Merge remote-tracking branch 'upstream/master'
Bug: Fixing an issue with renaming of the type in highlight layer for results from 'results' to 'highlight'
Added baseline smoothing to the UI