Merge branch 'develop' into 'master'

enunciate.xml

nb-configuration.xml

pom.xml

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

...c/controller/servlet/ForecastConfigurationController.java

.../vips/logic/controller/servlet/ObservationController.java

...vips/logic/controller/servlet/OrganizationController.java

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

...o/vips/logic/controller/servlet/SchedulingController.java

...o/nibio/vips/logic/controller/servlet/UserController.java

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

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

.../nibio/vips/logic/controller/session/ObservationBean.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

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

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

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

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