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
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
workflow updates. upstream ui changes blow away downstream changes.
Merge pull request #206 from cschroed-usgs/master

UI Workflow Updates