Merge

• modified
  .hgtags
• modified
  lib/csip-lib-water-4.1.1.jar
• added
  lib/csip-lib-water-4.2.1.jar
• modified
  nbproject/ant-deploy.xml
• modified
  nbproject/build-impl.xml
• modified
  nbproject/build-impl.xml~
• modified
  nbproject/project.properties
• modified
  nbproject/project.xml
• modified
  src/java/m/cfa/ApplicationConfig.java
• modified
  src/java/m/cfa/baseflow/V1_0.java
• modified
  src/java/m/cfa/baseflow/guiBaseflow_Model.java
• modified
  src/java/m/cfa/download/V1_0.java
• modified
  src/java/m/cfa/drought/V1_0.java
• modified
  src/java/m/cfa/durationcurve/V1_0.java
• modified
  src/java/m/cfa/errorstats/V1_0.java
• modified
  src/java/m/cfa/flood/V1_0.java
• modified
  src/java/m/cfa/loadest/V1_0.java
• modified
  src/java/m/cfa/loadest/guiLOADEST_Model.java
• modified
  src/java/m/cfa/regionalfdc/V1_0.java
• modified
  src/java/m/cfa/stagedischarge/V1_0.java
• modified
  src/java/m/cfa/storetservice/V1_0.java
• modified
  src/java/m/cfa/timeseries/DFLOW_lowFlowStats.java
• modified
  src/java/m/cfa/timeseries/V1_0.java
• modified
  src/java/m/cfa/timeseries/guiTimeseries_Model.java
• modified
  src/java/m/cfa/timeseries15min/V1_0.java
• modified
  src/java/m/cfa/trends/V1_0.java