Merge branch 'TE_OrganizationAdmin' into 'develop'

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

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

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

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

src/main/java/no/nibio/vips/logic/util/GISEntityUtil.java

...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

src/main/webapp/templates/master.ftl

src/main/webapp/templates/organizationForm.ftl

src/main/webapp/templates/organizationList.ftl