Merge branch 'master' into 'Luke'

nb-configuration.xml

src/jax-ws-catalog.xml

src/main/java/no/nibio/vips/logic/VIPSLogicApplication.java

.../nibio/vips/logic/controller/servlet/LoginController.java

...s/logic/controller/servlet/PointOfInterestController.java

.../no/nibio/vips/logic/controller/session/ForecastBean.java

...io/vips/logic/controller/session/PointOfInterestBean.java

...o/nibio/vips/logic/controller/session/SchedulingBean.java

...java/no/nibio/vips/logic/controller/session/UserBean.java

...ava/no/nibio/vips/logic/entity/ForecastConfiguration.java

src/main/java/no/nibio/vips/logic/entity/Organization.java

...main/java/no/nibio/vips/logic/entity/PreparationType.java

...ain/java/no/nibio/vips/logic/messaging/MessagingBean.java

...vips/logic/modules/applefruitmoth/AppleFruitMothBean.java

...ogic/modules/applefruitmoth/AppleFruitMothController.java

...io/vips/logic/modules/applefruitmoth/ObservationSite.java

...odules/applefruitmoth/ObservationSitePointSeasonData.java

...dules/applefruitmoth/ObservationSiteSeasonCommonData.java

...no/nibio/vips/logic/modules/roughage/RoughageService.java

...rocessor/ZymoseptoriaSimpleRiskGridModelPreprocessor.java