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
Added new splash image
Added new splash image, this time without text
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
Feature: First pass @ update transects
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
Merge pull request #207 from tkunicki-usgs/master

baseline smoothing
A couple modifications for Ivan and moved baseline accumulation code for reuse
Had the test ignored, didn't mean to do that
Merge conflict with Tom's changes
* this will teach me to pull before editing stuff
Second pass at transects/intersects editing/generation
Merge remote-tracking branch 'upstream/master'