Merge

• modified
  nbproject/build-impl.xml
• modified
  nbproject/build-impl.xml~
• modified
  nbproject/genfiles.properties
• modified
  nbproject/project.properties
• modified
  nbproject/project.xml
• modified
  src/java/m/wqm/ApplicationConfig.java
• modified
  src/java/m/wqm/nutmitigationtech/V1_0.java
• modified
  src/java/m/wqm/pestipmscoresfull/V1_0.java
• modified
  src/java/m/wqm/pestlosspot/V1_0.java
• modified
  src/java/m/wqm/pestmitgntechsfull/V1_0.java
• modified
  src/java/m/wqm/pestpractscores/V1_0.java
• modified
  src/java/m/wqm/sednutpractscoresfull/V1_0.java
• added
  test/service_tests/STest.java
• added
  test/service_tests/m_ipmscoresfull_1_0_1__getfull.json
• added
  test/service_tests/m_nutrient_slp_1_0__moderate.json
• added
  test/service_tests/m_nutrient_slp_1_0__moderate_1.json
• added
  test/service_tests/m_pesticide_practice_score_1_0__test_1.json
• added
  test/service_tests/m_pestipmscoresfull_1_0__test_1.json
• added
  test/service_tests/m_pestlosspot_1_0__test_1.json
• added
  test/service_tests/m_pestmigtechsfull_1_0__test_1.json
• modified
  web/META-INF/csip-conf-CSU.json
• modified
  web/META-INF/csip-conf.json
• modified
  web/WEB-INF/csip-defaults.json