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
Feature: Added ci to front end input for results calculation
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
Merge pull request #202 from isuftin/master

Feature: CI input
Merge pull request #203 from jread-usgs/master

R set for CI arg to be passed. W/ error checking for range.
ui propagation of state
Start of a edit transects process
* still need to actually edit transect
* figure out a STR-tree cache as well
A few more changes, wanted to actually do the intersection part
* still not working fully
Merge pull request #204 from jiwalker-usgs/master

Initial go at edit transects
Feature: Added a "results" object to the feature object to use with the management tab
Merge remote-tracking branch 'upstream/master'
Merge pull request #205 from isuftin/master

Results mgmt tab
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