Merge forecast-gridweather-option-vipsutv-610, fix conflicts

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

...ontroller/servlet/WeatherStationDataSourceController.java

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

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

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

.../no/nibio/vips/logic/entity/WeatherStationDataSource.java

.../no/nibio/vips/logic/scheduling/VipsLogicTaskFactory.java

...duling/model/preprocessor/AppleScabModelPreprocessor.java

...ic/scheduling/tasks/RunAllForecastConfigurationsTask.java

...19__Add_Organization_Property_Default_Grid_DataSource.sql

...rces/db/migration/V20__Add_Datasource_Property_IsGrid.sql

...ources/no/nibio/vips/logic/i18n/vipslogictexts.properties

...ces/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties

...ces/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties

...ces/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties

...ces/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties

.../no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties

src/main/webapp/WEB-INF/web.xml

src/main/webapp/formdefinitions/organizationForm.json

.../webapp/formdefinitions/weatherStationDataSourceForm.json