Merge develop - fix conflicts

.gitignore

pom.xml

...o/nibio/vips/logic/authenticate/AuthenticationFilter.java

.../nibio/vips/logic/controller/session/ObservationBean.java

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

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

.../no/nibio/vips/logic/entity/rest/ObservationListItem.java

.../java/no/nibio/vips/logic/service/ObservationService.java

...ain/java/no/nibio/vips/logic/util/ExcelFileGenerator.java

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

src/main/webapp/map_applications/phytophthora/js/map.js

src/main/webapp/templates/observationForm.ftl