From 8a4478a22d8449ed55e37c858bff70d2a959df59 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Fri, 7 Feb 2014 15:07:41 +0100
Subject: [PATCH] Added license notification headers for all remaining files

---
 .../vips/logic/VIPSLogicApplication.java      |  19 ++
 .../authenticate/AuthenticationFilter.java    |  19 ++
 .../authenticate/OpenIdAuthAttributes.java    |  19 ++
 .../authenticate/OpenIdRelyingParty.java      |  20 +-
 .../PasswordValidationException.java          |  19 ++
 .../ForecastConfigurationController.java      |  19 ++
 .../servlet/FrontpageController.java          |  19 ++
 .../controller/servlet/HttpErrorServlet.java  |  20 +-
 .../servlet/PointOfInterestController.java    |  19 ++
 .../servlet/SchedulingController.java         |  19 ++
 .../controller/servlet/TestFreemarker.java    |  23 +-
 .../session/PointOfInterestBean.java          |  19 ++
 .../controller/session/SchedulingBean.java    |  19 ++
 .../bioforsk/vips/logic/entity/Country.java   |  19 ++
 .../entity/ForecastModelConfiguration.java    |  19 +-
 .../entity/ForecastModelConfigurationPK.java  |  19 ++
 .../vips/logic/entity/HierarchyCategory.java  |  18 +-
 .../bioforsk/vips/logic/entity/Message.java   | 127 +++++++++++
 .../vips/logic/entity/MessageLocale.java      | 213 ++++++++++++++++++
 .../vips/logic/entity/MessageLocalePK.java    |  98 ++++++++
 .../vips/logic/entity/MessageTag.java         | 135 +++++++++++
 .../vips/logic/entity/MessageTagLocale.java   | 117 ++++++++++
 .../vips/logic/entity/MessageTagLocalePK.java |  98 ++++++++
 .../vips/logic/entity/ModelInformation.java   |  19 ++
 .../entity/OrganismExternalResource.java      |  18 +-
 .../entity/OrganismExternalResourcePK.java    |  18 +-
 .../vips/logic/entity/Organization.java       |  19 +-
 .../logic/entity/PointOfInterestType.java     |  18 +-
 .../entity/PointOfInterestWeatherStation.java |  20 +-
 .../vips/logic/entity/UserAuthentication.java |  19 +-
 .../logic/entity/UserAuthenticationPK.java    |  19 ++
 .../logic/entity/UserAuthenticationType.java  |  19 +-
 .../logic/entity/UserPointOfInterest.java     |  18 +-
 .../logic/entity/UserPointOfInterestPK.java   |  18 +-
 .../vips/logic/entity/VipsLogicRole.java      |  19 ++
 .../vips/logic/entity/VipsLogicUser.java      |  19 ++
 .../entity/WeatherStationDataSource.java      |  19 ++
 .../logic/entity/helpers/HstoreHelper.java    |  19 ++
 .../logic/i18n/CharacterEncodingFilter.java   |  19 ++
 .../vips/logic/scheduling/SchedulingTest.java |  19 ++
 .../scheduling/VIPSLogicTaskCollector.java    |  19 ++
 .../model/ModelRunPreprocessor.java           |  19 ++
 .../RunAppleScabModelForOrganizationTask.java |  19 ++
 .../vips/logic/service/LogicService.java      |  19 ++
 .../vips/logic/startup/StartupListener.java   |  20 +-
 .../no/bioforsk/vips/logic/util/Globals.java  |  19 ++
 .../bioforsk/vips/logic/util/StringUtils.java |  19 ++
 .../bioforsk/vips/logic/util/SystemTime.java  |  19 ++
 .../no/bioforsk/web/forms/FormValidation.java |  19 ++
 src/main/resources/META-INF/persistence.xml   |  17 ++
 .../vips/logic/i18n/vipslogictexts.properties |  19 +-
 .../logic/i18n/vipslogictexts_no.properties   |  19 +-
 .../vips/logic/i18n/vtpassword.properties     |  17 ++
 .../vips/logic/i18n/vtpassword_no.properties  |  17 ++
 src/main/resources/server.properties          |  17 +-
 src/main/webapp/WEB-INF/jboss-web.xml         |  17 ++
 src/main/webapp/WEB-INF/web.xml               |  17 ++
 src/main/webapp/css/signin.css                |  18 ++
 src/main/webapp/css/vipslogic.css             |  18 ++
 .../forecastConfigurationForm.json            |  17 ++
 .../formdefinitions/models/APPLESCABM.json    |  17 ++
 .../formdefinitions/models/NAERSTADMO.json    |  17 ++
 .../webapp/formdefinitions/organismForm.json  |  17 ++
 .../formdefinitions/taskHistoryDateForm.json  |  17 ++
 src/main/webapp/formdefinitions/userForm.json |  17 ++
 .../userRegistrationFormType1.json            |  17 ++
 .../userRegistrationFormType2.json            |  17 ++
 .../userRegistrationFormType3.json            |  17 ++
 src/main/webapp/js/validateForm.js            |   4 +-
 src/main/webapp/templates/error_unknown.ftl   |  18 +-
 .../templates/forecastConfigurationForm.ftl   |  18 +-
 .../templates/forecastConfigurationList.ftl   |  18 +-
 src/main/webapp/templates/index.ftl           |  18 +-
 src/main/webapp/templates/login.ftl           |  18 +-
 src/main/webapp/templates/master.ftl          |  17 ++
 .../webapp/templates/master_errorpages.ftl    |  18 +-
 src/main/webapp/templates/organism.ftl        |  18 +-
 src/main/webapp/templates/organismDetails.ftl |  18 +-
 src/main/webapp/templates/poi.ftl             |  18 +-
 .../webapp/templates/registerOpenIdForm.ftl   |  18 +-
 .../webapp/templates/taskHistoryDetails.ftl   |  18 +-
 src/main/webapp/templates/taskList.ftl        |  18 +-
 src/main/webapp/templates/userForm.ftl        |  18 +-
 src/main/webapp/templates/userList.ftl        |  18 +-
 .../webapp/templates/userRegistrationForm.ftl |  18 +-
 src/main/webapp/templates/weatherstation.ftl  |  18 +-
 .../webapp/templates/weatherstationform.ftl   |  18 +-
 .../webapp/templates/weatherstationlist.ftl   |  18 +-
 src/test/resources/Untitled Document 1        |  10 -
 89 files changed, 2220 insertions(+), 71 deletions(-)
 create mode 100644 src/main/java/no/bioforsk/vips/logic/entity/Message.java
 create mode 100644 src/main/java/no/bioforsk/vips/logic/entity/MessageLocale.java
 create mode 100644 src/main/java/no/bioforsk/vips/logic/entity/MessageLocalePK.java
 create mode 100644 src/main/java/no/bioforsk/vips/logic/entity/MessageTag.java
 create mode 100644 src/main/java/no/bioforsk/vips/logic/entity/MessageTagLocale.java
 create mode 100644 src/main/java/no/bioforsk/vips/logic/entity/MessageTagLocalePK.java
 delete mode 100644 src/test/resources/Untitled Document 1

diff --git a/src/main/java/no/bioforsk/vips/logic/VIPSLogicApplication.java b/src/main/java/no/bioforsk/vips/logic/VIPSLogicApplication.java
index 342d21df..423abd7c 100644
--- a/src/main/java/no/bioforsk/vips/logic/VIPSLogicApplication.java
+++ b/src/main/java/no/bioforsk/vips/logic/VIPSLogicApplication.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 package no.bioforsk.vips.logic;
 
 import java.util.Set;
diff --git a/src/main/java/no/bioforsk/vips/logic/authenticate/AuthenticationFilter.java b/src/main/java/no/bioforsk/vips/logic/authenticate/AuthenticationFilter.java
index 53807a62..2223dc36 100644
--- a/src/main/java/no/bioforsk/vips/logic/authenticate/AuthenticationFilter.java
+++ b/src/main/java/no/bioforsk/vips/logic/authenticate/AuthenticationFilter.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 package no.bioforsk.vips.logic.authenticate;
 
 
diff --git a/src/main/java/no/bioforsk/vips/logic/authenticate/OpenIdAuthAttributes.java b/src/main/java/no/bioforsk/vips/logic/authenticate/OpenIdAuthAttributes.java
index b167e5bb..a14f7205 100644
--- a/src/main/java/no/bioforsk/vips/logic/authenticate/OpenIdAuthAttributes.java
+++ b/src/main/java/no/bioforsk/vips/logic/authenticate/OpenIdAuthAttributes.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 package no.bioforsk.vips.logic.authenticate;
 
 /**
diff --git a/src/main/java/no/bioforsk/vips/logic/authenticate/OpenIdRelyingParty.java b/src/main/java/no/bioforsk/vips/logic/authenticate/OpenIdRelyingParty.java
index 7e5f023f..20584f26 100644
--- a/src/main/java/no/bioforsk/vips/logic/authenticate/OpenIdRelyingParty.java
+++ b/src/main/java/no/bioforsk/vips/logic/authenticate/OpenIdRelyingParty.java
@@ -1,8 +1,26 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 package no.bioforsk.vips.logic.authenticate;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import no.bioforsk.vips.util.ServletUtil;
diff --git a/src/main/java/no/bioforsk/vips/logic/authenticate/PasswordValidationException.java b/src/main/java/no/bioforsk/vips/logic/authenticate/PasswordValidationException.java
index 30a981d5..a05a3b3c 100644
--- a/src/main/java/no/bioforsk/vips/logic/authenticate/PasswordValidationException.java
+++ b/src/main/java/no/bioforsk/vips/logic/authenticate/PasswordValidationException.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 package no.bioforsk.vips.logic.authenticate;
 
 /**
diff --git a/src/main/java/no/bioforsk/vips/logic/controller/servlet/ForecastConfigurationController.java b/src/main/java/no/bioforsk/vips/logic/controller/servlet/ForecastConfigurationController.java
index 8f287be2..afec7f7a 100644
--- a/src/main/java/no/bioforsk/vips/logic/controller/servlet/ForecastConfigurationController.java
+++ b/src/main/java/no/bioforsk/vips/logic/controller/servlet/ForecastConfigurationController.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 package no.bioforsk.vips.logic.controller.servlet;
 
 import java.io.IOException;
diff --git a/src/main/java/no/bioforsk/vips/logic/controller/servlet/FrontpageController.java b/src/main/java/no/bioforsk/vips/logic/controller/servlet/FrontpageController.java
index 3ffaabac..e534c950 100644
--- a/src/main/java/no/bioforsk/vips/logic/controller/servlet/FrontpageController.java
+++ b/src/main/java/no/bioforsk/vips/logic/controller/servlet/FrontpageController.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 package no.bioforsk.vips.logic.controller.servlet;
 
 import java.io.IOException;
diff --git a/src/main/java/no/bioforsk/vips/logic/controller/servlet/HttpErrorServlet.java b/src/main/java/no/bioforsk/vips/logic/controller/servlet/HttpErrorServlet.java
index a42d689c..46ed5dea 100644
--- a/src/main/java/no/bioforsk/vips/logic/controller/servlet/HttpErrorServlet.java
+++ b/src/main/java/no/bioforsk/vips/logic/controller/servlet/HttpErrorServlet.java
@@ -1,7 +1,25 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 package no.bioforsk.vips.logic.controller.servlet;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.util.Enumeration;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
diff --git a/src/main/java/no/bioforsk/vips/logic/controller/servlet/PointOfInterestController.java b/src/main/java/no/bioforsk/vips/logic/controller/servlet/PointOfInterestController.java
index 4bfe9927..2a8bc7cc 100644
--- a/src/main/java/no/bioforsk/vips/logic/controller/servlet/PointOfInterestController.java
+++ b/src/main/java/no/bioforsk/vips/logic/controller/servlet/PointOfInterestController.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 package no.bioforsk.vips.logic.controller.servlet;
 
 import java.io.IOException;
diff --git a/src/main/java/no/bioforsk/vips/logic/controller/servlet/SchedulingController.java b/src/main/java/no/bioforsk/vips/logic/controller/servlet/SchedulingController.java
index b26e8741..e7857ed7 100644
--- a/src/main/java/no/bioforsk/vips/logic/controller/servlet/SchedulingController.java
+++ b/src/main/java/no/bioforsk/vips/logic/controller/servlet/SchedulingController.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 package no.bioforsk.vips.logic.controller.servlet;
 
 import it.sauronsoftware.cron4j.Scheduler;
diff --git a/src/main/java/no/bioforsk/vips/logic/controller/servlet/TestFreemarker.java b/src/main/java/no/bioforsk/vips/logic/controller/servlet/TestFreemarker.java
index 15941d6b..088fad36 100644
--- a/src/main/java/no/bioforsk/vips/logic/controller/servlet/TestFreemarker.java
+++ b/src/main/java/no/bioforsk/vips/logic/controller/servlet/TestFreemarker.java
@@ -1,14 +1,25 @@
 /*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
+
 package no.bioforsk.vips.logic.controller.servlet;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/main/java/no/bioforsk/vips/logic/controller/session/PointOfInterestBean.java b/src/main/java/no/bioforsk/vips/logic/controller/session/PointOfInterestBean.java
index 245d0155..5887d6f9 100644
--- a/src/main/java/no/bioforsk/vips/logic/controller/session/PointOfInterestBean.java
+++ b/src/main/java/no/bioforsk/vips/logic/controller/session/PointOfInterestBean.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 package no.bioforsk.vips.logic.controller.session;
 
 import java.util.List;
diff --git a/src/main/java/no/bioforsk/vips/logic/controller/session/SchedulingBean.java b/src/main/java/no/bioforsk/vips/logic/controller/session/SchedulingBean.java
index 5256648e..8cef5772 100644
--- a/src/main/java/no/bioforsk/vips/logic/controller/session/SchedulingBean.java
+++ b/src/main/java/no/bioforsk/vips/logic/controller/session/SchedulingBean.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 package no.bioforsk.vips.logic.controller.session;
 
 import it.sauronsoftware.cron4j.Predictor;
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/Country.java b/src/main/java/no/bioforsk/vips/logic/entity/Country.java
index 5936b1ec..07cdc5e4 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/Country.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/Country.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 package no.bioforsk.vips.logic.entity;
 
 import java.io.Serializable;
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/ForecastModelConfiguration.java b/src/main/java/no/bioforsk/vips/logic/entity/ForecastModelConfiguration.java
index c4a99d81..343cf2e4 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/ForecastModelConfiguration.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/ForecastModelConfiguration.java
@@ -1,7 +1,20 @@
 /*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 package no.bioforsk.vips.logic.entity;
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/ForecastModelConfigurationPK.java b/src/main/java/no/bioforsk/vips/logic/entity/ForecastModelConfigurationPK.java
index e0af251a..8f404502 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/ForecastModelConfigurationPK.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/ForecastModelConfigurationPK.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 package no.bioforsk.vips.logic.entity;
 
 import java.io.Serializable;
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/HierarchyCategory.java b/src/main/java/no/bioforsk/vips/logic/entity/HierarchyCategory.java
index 537c3ada..dc67841e 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/HierarchyCategory.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/HierarchyCategory.java
@@ -1,6 +1,20 @@
 /*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 package no.bioforsk.vips.logic.entity;
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/Message.java b/src/main/java/no/bioforsk/vips/logic/entity/Message.java
new file mode 100644
index 00000000..139d40fa
--- /dev/null
+++ b/src/main/java/no/bioforsk/vips/logic/entity/Message.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
+package no.bioforsk.vips.logic.entity;
+
+import java.io.Serializable;
+import java.util.Set;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
+import org.codehaus.jackson.annotate.JsonIgnore;
+
+/**
+ * @copyright 2014 <a href="http://www.bioforsk.no/">Bioforsk</a>
+ * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ */
+@Entity
+@Table(name = "message")
+@XmlRootElement
+@NamedQueries({
+    @NamedQuery(name = "Message.findAll", query = "SELECT m FROM Message m"),
+    @NamedQuery(name = "Message.findByMessageId", query = "SELECT m FROM Message m WHERE m.messageId = :messageId")})
+public class Message implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Basic(optional = false)
+    @Column(name = "message_id")
+    private Integer messageId;
+    @JoinTable(name = "message_message_tag", joinColumns = {
+        @JoinColumn(name = "message_id", referencedColumnName = "message_id")}, inverseJoinColumns = {
+        @JoinColumn(name = "message_tag_id", referencedColumnName = "message_tag_id")})
+    @ManyToMany
+    private Set<MessageTag> messageTagSet;
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "message")
+    private Set<MessageLocale> messageLocaleSet;
+
+    public Message() {
+    }
+
+    public Message(Integer messageId) {
+        this.messageId = messageId;
+    }
+
+    public Integer getMessageId() {
+        return messageId;
+    }
+
+    public void setMessageId(Integer messageId) {
+        this.messageId = messageId;
+    }
+
+    @XmlTransient
+    @JsonIgnore
+    public Set<MessageTag> getMessageTagSet() {
+        return messageTagSet;
+    }
+
+    public void setMessageTagSet(Set<MessageTag> messageTagSet) {
+        this.messageTagSet = messageTagSet;
+    }
+
+    @XmlTransient
+    @JsonIgnore
+    public Set<MessageLocale> getMessageLocaleSet() {
+        return messageLocaleSet;
+    }
+
+    public void setMessageLocaleSet(Set<MessageLocale> messageLocaleSet) {
+        this.messageLocaleSet = messageLocaleSet;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 0;
+        hash += (messageId != null ? messageId.hashCode() : 0);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        // TODO: Warning - this method won't work in the case the id fields are not set
+        if (!(object instanceof Message)) {
+            return false;
+        }
+        Message other = (Message) object;
+        if ((this.messageId == null && other.messageId != null) || (this.messageId != null && !this.messageId.equals(other.messageId))) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return "no.bioforsk.vips.logic.entity.Message[ messageId=" + messageId + " ]";
+    }
+
+}
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/MessageLocale.java b/src/main/java/no/bioforsk/vips/logic/entity/MessageLocale.java
new file mode 100644
index 00000000..b7bb95e4
--- /dev/null
+++ b/src/main/java/no/bioforsk/vips/logic/entity/MessageLocale.java
@@ -0,0 +1,213 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
+package no.bioforsk.vips.logic.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * @copyright 2014 <a href="http://www.bioforsk.no/">Bioforsk</a>
+ * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ */
+@Entity
+@Table(name = "message_locale")
+@XmlRootElement
+@NamedQueries({
+    @NamedQuery(name = "MessageLocale.findAll", query = "SELECT m FROM MessageLocale m"),
+    @NamedQuery(name = "MessageLocale.findByMessageId", query = "SELECT m FROM MessageLocale m WHERE m.messageLocalePK.messageId = :messageId"),
+    @NamedQuery(name = "MessageLocale.findByLocale", query = "SELECT m FROM MessageLocale m WHERE m.messageLocalePK.locale = :locale"),
+    @NamedQuery(name = "MessageLocale.findByHeading", query = "SELECT m FROM MessageLocale m WHERE m.heading = :heading"),
+    @NamedQuery(name = "MessageLocale.findByLeadParagraph", query = "SELECT m FROM MessageLocale m WHERE m.leadParagraph = :leadParagraph"),
+    @NamedQuery(name = "MessageLocale.findByBody", query = "SELECT m FROM MessageLocale m WHERE m.body = :body"),
+    @NamedQuery(name = "MessageLocale.findByPubDate", query = "SELECT m FROM MessageLocale m WHERE m.pubDate = :pubDate"),
+    @NamedQuery(name = "MessageLocale.findByValidToDate", query = "SELECT m FROM MessageLocale m WHERE m.validToDate = :validToDate"),
+    @NamedQuery(name = "MessageLocale.findByIllustration", query = "SELECT m FROM MessageLocale m WHERE m.illustration = :illustration"),
+    @NamedQuery(name = "MessageLocale.findByCreatedTimestamp", query = "SELECT m FROM MessageLocale m WHERE m.createdTimestamp = :createdTimestamp"),
+    @NamedQuery(name = "MessageLocale.findByModifiedTimestamp", query = "SELECT m FROM MessageLocale m WHERE m.modifiedTimestamp = :modifiedTimestamp")})
+public class MessageLocale implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @EmbeddedId
+    protected MessageLocalePK messageLocalePK;
+    @Basic(optional = false)
+    @NotNull
+    @Size(min = 1, max = 511)
+    @Column(name = "heading")
+    private String heading;
+    @Size(max = 2147483647)
+    @Column(name = "lead_paragraph")
+    private String leadParagraph;
+    @Size(max = 2147483647)
+    @Column(name = "body")
+    private String body;
+    @Column(name = "pub_date")
+    @Temporal(TemporalType.DATE)
+    private Date pubDate;
+    @Column(name = "valid_to_date")
+    @Temporal(TemporalType.DATE)
+    private Date validToDate;
+    @Size(max = 2047)
+    @Column(name = "illustration")
+    private String illustration;
+    @Column(name = "created_timestamp")
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date createdTimestamp;
+    @Column(name = "modified_timestamp")
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date modifiedTimestamp;
+    @JoinColumn(name = "message_id", referencedColumnName = "message_id", insertable = false, updatable = false)
+    @ManyToOne(optional = false)
+    private Message message;
+
+    public MessageLocale() {
+    }
+
+    public MessageLocale(MessageLocalePK messageLocalePK) {
+        this.messageLocalePK = messageLocalePK;
+    }
+
+    public MessageLocale(MessageLocalePK messageLocalePK, String heading) {
+        this.messageLocalePK = messageLocalePK;
+        this.heading = heading;
+    }
+
+    public MessageLocale(int messageId, String locale) {
+        this.messageLocalePK = new MessageLocalePK(messageId, locale);
+    }
+
+    public MessageLocalePK getMessageLocalePK() {
+        return messageLocalePK;
+    }
+
+    public void setMessageLocalePK(MessageLocalePK messageLocalePK) {
+        this.messageLocalePK = messageLocalePK;
+    }
+
+    public String getHeading() {
+        return heading;
+    }
+
+    public void setHeading(String heading) {
+        this.heading = heading;
+    }
+
+    public String getLeadParagraph() {
+        return leadParagraph;
+    }
+
+    public void setLeadParagraph(String leadParagraph) {
+        this.leadParagraph = leadParagraph;
+    }
+
+    public String getBody() {
+        return body;
+    }
+
+    public void setBody(String body) {
+        this.body = body;
+    }
+
+    public Date getPubDate() {
+        return pubDate;
+    }
+
+    public void setPubDate(Date pubDate) {
+        this.pubDate = pubDate;
+    }
+
+    public Date getValidToDate() {
+        return validToDate;
+    }
+
+    public void setValidToDate(Date validToDate) {
+        this.validToDate = validToDate;
+    }
+
+    public String getIllustration() {
+        return illustration;
+    }
+
+    public void setIllustration(String illustration) {
+        this.illustration = illustration;
+    }
+
+    public Date getCreatedTimestamp() {
+        return createdTimestamp;
+    }
+
+    public void setCreatedTimestamp(Date createdTimestamp) {
+        this.createdTimestamp = createdTimestamp;
+    }
+
+    public Date getModifiedTimestamp() {
+        return modifiedTimestamp;
+    }
+
+    public void setModifiedTimestamp(Date modifiedTimestamp) {
+        this.modifiedTimestamp = modifiedTimestamp;
+    }
+
+    public Message getMessage() {
+        return message;
+    }
+
+    public void setMessage(Message message) {
+        this.message = message;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 0;
+        hash += (messageLocalePK != null ? messageLocalePK.hashCode() : 0);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        // TODO: Warning - this method won't work in the case the id fields are not set
+        if (!(object instanceof MessageLocale)) {
+            return false;
+        }
+        MessageLocale other = (MessageLocale) object;
+        if ((this.messageLocalePK == null && other.messageLocalePK != null) || (this.messageLocalePK != null && !this.messageLocalePK.equals(other.messageLocalePK))) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return "no.bioforsk.vips.logic.entity.MessageLocale[ messageLocalePK=" + messageLocalePK + " ]";
+    }
+
+}
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/MessageLocalePK.java b/src/main/java/no/bioforsk/vips/logic/entity/MessageLocalePK.java
new file mode 100644
index 00000000..827feaad
--- /dev/null
+++ b/src/main/java/no/bioforsk/vips/logic/entity/MessageLocalePK.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
+package no.bioforsk.vips.logic.entity;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+/**
+ * @copyright 2014 <a href="http://www.bioforsk.no/">Bioforsk</a>
+ * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ */
+@Embeddable
+public class MessageLocalePK implements Serializable {
+    @Basic(optional = false)
+    @NotNull
+    @Column(name = "message_id")
+    private int messageId;
+    @Basic(optional = false)
+    @NotNull
+    @Size(min = 1, max = 10)
+    @Column(name = "locale")
+    private String locale;
+
+    public MessageLocalePK() {
+    }
+
+    public MessageLocalePK(int messageId, String locale) {
+        this.messageId = messageId;
+        this.locale = locale;
+    }
+
+    public int getMessageId() {
+        return messageId;
+    }
+
+    public void setMessageId(int messageId) {
+        this.messageId = messageId;
+    }
+
+    public String getLocale() {
+        return locale;
+    }
+
+    public void setLocale(String locale) {
+        this.locale = locale;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 0;
+        hash += (int) messageId;
+        hash += (locale != null ? locale.hashCode() : 0);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        // TODO: Warning - this method won't work in the case the id fields are not set
+        if (!(object instanceof MessageLocalePK)) {
+            return false;
+        }
+        MessageLocalePK other = (MessageLocalePK) object;
+        if (this.messageId != other.messageId) {
+            return false;
+        }
+        if ((this.locale == null && other.locale != null) || (this.locale != null && !this.locale.equals(other.locale))) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return "no.bioforsk.vips.logic.entity.MessageLocalePK[ messageId=" + messageId + ", locale=" + locale + " ]";
+    }
+
+}
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/MessageTag.java b/src/main/java/no/bioforsk/vips/logic/entity/MessageTag.java
new file mode 100644
index 00000000..bc61a1d7
--- /dev/null
+++ b/src/main/java/no/bioforsk/vips/logic/entity/MessageTag.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
+package no.bioforsk.vips.logic.entity;
+
+import java.io.Serializable;
+import java.util.Set;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.validation.constraints.Size;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
+import org.codehaus.jackson.annotate.JsonIgnore;
+
+/**
+ * @copyright 2014 <a href="http://www.bioforsk.no/">Bioforsk</a>
+ * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ */
+@Entity
+@Table(name = "message_tag")
+@XmlRootElement
+@NamedQueries({
+    @NamedQuery(name = "MessageTag.findAll", query = "SELECT m FROM MessageTag m"),
+    @NamedQuery(name = "MessageTag.findByMessageTagId", query = "SELECT m FROM MessageTag m WHERE m.messageTagId = :messageTagId"),
+    @NamedQuery(name = "MessageTag.findByDefaultTagName", query = "SELECT m FROM MessageTag m WHERE m.defaultTagName = :defaultTagName")})
+public class MessageTag implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Basic(optional = false)
+    @Column(name = "message_tag_id")
+    private Integer messageTagId;
+    @Size(max = 255)
+    @Column(name = "default_tag_name")
+    private String defaultTagName;
+    @ManyToMany(mappedBy = "messageTagSet")
+    private Set<Message> messageSet;
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "messageTag")
+    private Set<MessageTagLocale> messageTagLocaleSet;
+
+    public MessageTag() {
+    }
+
+    public MessageTag(Integer messageTagId) {
+        this.messageTagId = messageTagId;
+    }
+
+    public Integer getMessageTagId() {
+        return messageTagId;
+    }
+
+    public void setMessageTagId(Integer messageTagId) {
+        this.messageTagId = messageTagId;
+    }
+
+    public String getDefaultTagName() {
+        return defaultTagName;
+    }
+
+    public void setDefaultTagName(String defaultTagName) {
+        this.defaultTagName = defaultTagName;
+    }
+
+    @XmlTransient
+    @JsonIgnore
+    public Set<Message> getMessageSet() {
+        return messageSet;
+    }
+
+    public void setMessageSet(Set<Message> messageSet) {
+        this.messageSet = messageSet;
+    }
+
+    @XmlTransient
+    @JsonIgnore
+    public Set<MessageTagLocale> getMessageTagLocaleSet() {
+        return messageTagLocaleSet;
+    }
+
+    public void setMessageTagLocaleSet(Set<MessageTagLocale> messageTagLocaleSet) {
+        this.messageTagLocaleSet = messageTagLocaleSet;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 0;
+        hash += (messageTagId != null ? messageTagId.hashCode() : 0);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        // TODO: Warning - this method won't work in the case the id fields are not set
+        if (!(object instanceof MessageTag)) {
+            return false;
+        }
+        MessageTag other = (MessageTag) object;
+        if ((this.messageTagId == null && other.messageTagId != null) || (this.messageTagId != null && !this.messageTagId.equals(other.messageTagId))) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return "no.bioforsk.vips.logic.entity.MessageTag[ messageTagId=" + messageTagId + " ]";
+    }
+
+}
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/MessageTagLocale.java b/src/main/java/no/bioforsk/vips/logic/entity/MessageTagLocale.java
new file mode 100644
index 00000000..3d716de3
--- /dev/null
+++ b/src/main/java/no/bioforsk/vips/logic/entity/MessageTagLocale.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
+package no.bioforsk.vips.logic.entity;
+
+import java.io.Serializable;
+import javax.persistence.Column;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+import javax.validation.constraints.Size;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * @copyright 2014 <a href="http://www.bioforsk.no/">Bioforsk</a>
+ * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ */
+@Entity
+@Table(name = "message_tag_locale")
+@XmlRootElement
+@NamedQueries({
+    @NamedQuery(name = "MessageTagLocale.findAll", query = "SELECT m FROM MessageTagLocale m"),
+    @NamedQuery(name = "MessageTagLocale.findByMessageTagId", query = "SELECT m FROM MessageTagLocale m WHERE m.messageTagLocalePK.messageTagId = :messageTagId"),
+    @NamedQuery(name = "MessageTagLocale.findByLocale", query = "SELECT m FROM MessageTagLocale m WHERE m.messageTagLocalePK.locale = :locale"),
+    @NamedQuery(name = "MessageTagLocale.findByLocalName", query = "SELECT m FROM MessageTagLocale m WHERE m.localName = :localName")})
+public class MessageTagLocale implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @EmbeddedId
+    protected MessageTagLocalePK messageTagLocalePK;
+    @Size(max = 255)
+    @Column(name = "local_name")
+    private String localName;
+    @JoinColumn(name = "message_tag_id", referencedColumnName = "message_tag_id", insertable = false, updatable = false)
+    @ManyToOne(optional = false)
+    private MessageTag messageTag;
+
+    public MessageTagLocale() {
+    }
+
+    public MessageTagLocale(MessageTagLocalePK messageTagLocalePK) {
+        this.messageTagLocalePK = messageTagLocalePK;
+    }
+
+    public MessageTagLocale(int messageTagId, String locale) {
+        this.messageTagLocalePK = new MessageTagLocalePK(messageTagId, locale);
+    }
+
+    public MessageTagLocalePK getMessageTagLocalePK() {
+        return messageTagLocalePK;
+    }
+
+    public void setMessageTagLocalePK(MessageTagLocalePK messageTagLocalePK) {
+        this.messageTagLocalePK = messageTagLocalePK;
+    }
+
+    public String getLocalName() {
+        return localName;
+    }
+
+    public void setLocalName(String localName) {
+        this.localName = localName;
+    }
+
+    public MessageTag getMessageTag() {
+        return messageTag;
+    }
+
+    public void setMessageTag(MessageTag messageTag) {
+        this.messageTag = messageTag;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 0;
+        hash += (messageTagLocalePK != null ? messageTagLocalePK.hashCode() : 0);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        // TODO: Warning - this method won't work in the case the id fields are not set
+        if (!(object instanceof MessageTagLocale)) {
+            return false;
+        }
+        MessageTagLocale other = (MessageTagLocale) object;
+        if ((this.messageTagLocalePK == null && other.messageTagLocalePK != null) || (this.messageTagLocalePK != null && !this.messageTagLocalePK.equals(other.messageTagLocalePK))) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return "no.bioforsk.vips.logic.entity.MessageTagLocale[ messageTagLocalePK=" + messageTagLocalePK + " ]";
+    }
+
+}
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/MessageTagLocalePK.java b/src/main/java/no/bioforsk/vips/logic/entity/MessageTagLocalePK.java
new file mode 100644
index 00000000..fe43b033
--- /dev/null
+++ b/src/main/java/no/bioforsk/vips/logic/entity/MessageTagLocalePK.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
+package no.bioforsk.vips.logic.entity;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+/**
+ * @copyright 2014 <a href="http://www.bioforsk.no/">Bioforsk</a>
+ * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ */
+@Embeddable
+public class MessageTagLocalePK implements Serializable {
+    @Basic(optional = false)
+    @NotNull
+    @Column(name = "message_tag_id")
+    private int messageTagId;
+    @Basic(optional = false)
+    @NotNull
+    @Size(min = 1, max = 10)
+    @Column(name = "locale")
+    private String locale;
+
+    public MessageTagLocalePK() {
+    }
+
+    public MessageTagLocalePK(int messageTagId, String locale) {
+        this.messageTagId = messageTagId;
+        this.locale = locale;
+    }
+
+    public int getMessageTagId() {
+        return messageTagId;
+    }
+
+    public void setMessageTagId(int messageTagId) {
+        this.messageTagId = messageTagId;
+    }
+
+    public String getLocale() {
+        return locale;
+    }
+
+    public void setLocale(String locale) {
+        this.locale = locale;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 0;
+        hash += (int) messageTagId;
+        hash += (locale != null ? locale.hashCode() : 0);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        // TODO: Warning - this method won't work in the case the id fields are not set
+        if (!(object instanceof MessageTagLocalePK)) {
+            return false;
+        }
+        MessageTagLocalePK other = (MessageTagLocalePK) object;
+        if (this.messageTagId != other.messageTagId) {
+            return false;
+        }
+        if ((this.locale == null && other.locale != null) || (this.locale != null && !this.locale.equals(other.locale))) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return "no.bioforsk.vips.logic.entity.MessageTagLocalePK[ messageTagId=" + messageTagId + ", locale=" + locale + " ]";
+    }
+
+}
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/ModelInformation.java b/src/main/java/no/bioforsk/vips/logic/entity/ModelInformation.java
index 4ed6fd0c..1b7d5c04 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/ModelInformation.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/ModelInformation.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 package no.bioforsk.vips.logic.entity;
 
 import java.io.Serializable;
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/OrganismExternalResource.java b/src/main/java/no/bioforsk/vips/logic/entity/OrganismExternalResource.java
index 5426d7bd..8e82b7a2 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/OrganismExternalResource.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/OrganismExternalResource.java
@@ -1,6 +1,20 @@
 /*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 package no.bioforsk.vips.logic.entity;
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/OrganismExternalResourcePK.java b/src/main/java/no/bioforsk/vips/logic/entity/OrganismExternalResourcePK.java
index b9b3f148..47771a50 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/OrganismExternalResourcePK.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/OrganismExternalResourcePK.java
@@ -1,6 +1,20 @@
 /*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 package no.bioforsk.vips.logic.entity;
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/Organization.java b/src/main/java/no/bioforsk/vips/logic/entity/Organization.java
index 59cdacb4..a2c94e5b 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/Organization.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/Organization.java
@@ -1,7 +1,20 @@
 /*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 package no.bioforsk.vips.logic.entity;
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/PointOfInterestType.java b/src/main/java/no/bioforsk/vips/logic/entity/PointOfInterestType.java
index 2abc622d..d3ac34b1 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/PointOfInterestType.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/PointOfInterestType.java
@@ -1,6 +1,20 @@
 /*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 package no.bioforsk.vips.logic.entity;
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/PointOfInterestWeatherStation.java b/src/main/java/no/bioforsk/vips/logic/entity/PointOfInterestWeatherStation.java
index ed49bafb..5c275e70 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/PointOfInterestWeatherStation.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/PointOfInterestWeatherStation.java
@@ -1,7 +1,25 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 package no.bioforsk.vips.logic.entity;
 
 import java.io.Serializable;
-import java.text.MessageFormat;
 import javax.persistence.Column;
 import javax.persistence.DiscriminatorValue;
 import javax.persistence.Entity;
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/UserAuthentication.java b/src/main/java/no/bioforsk/vips/logic/entity/UserAuthentication.java
index c6744288..76472f8a 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/UserAuthentication.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/UserAuthentication.java
@@ -1,7 +1,20 @@
 /*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 package no.bioforsk.vips.logic.entity;
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/UserAuthenticationPK.java b/src/main/java/no/bioforsk/vips/logic/entity/UserAuthenticationPK.java
index 1700297c..f9b2e36e 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/UserAuthenticationPK.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/UserAuthenticationPK.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 package no.bioforsk.vips.logic.entity;
 
 import java.io.Serializable;
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/UserAuthenticationType.java b/src/main/java/no/bioforsk/vips/logic/entity/UserAuthenticationType.java
index 8f0d3c80..f854565c 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/UserAuthenticationType.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/UserAuthenticationType.java
@@ -1,7 +1,20 @@
 /*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 package no.bioforsk.vips.logic.entity;
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/UserPointOfInterest.java b/src/main/java/no/bioforsk/vips/logic/entity/UserPointOfInterest.java
index 61e0226c..23587f20 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/UserPointOfInterest.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/UserPointOfInterest.java
@@ -1,6 +1,20 @@
 /*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 package no.bioforsk.vips.logic.entity;
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/UserPointOfInterestPK.java b/src/main/java/no/bioforsk/vips/logic/entity/UserPointOfInterestPK.java
index 7333a659..c1d95d6a 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/UserPointOfInterestPK.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/UserPointOfInterestPK.java
@@ -1,6 +1,20 @@
 /*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 package no.bioforsk.vips.logic.entity;
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/VipsLogicRole.java b/src/main/java/no/bioforsk/vips/logic/entity/VipsLogicRole.java
index 6f703a6b..9a9916de 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/VipsLogicRole.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/VipsLogicRole.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 package no.bioforsk.vips.logic.entity;
 
 import java.io.Serializable;
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/VipsLogicUser.java b/src/main/java/no/bioforsk/vips/logic/entity/VipsLogicUser.java
index 1f743a76..982d8454 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/VipsLogicUser.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/VipsLogicUser.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 package no.bioforsk.vips.logic.entity;
 
 import java.io.Serializable;
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/WeatherStationDataSource.java b/src/main/java/no/bioforsk/vips/logic/entity/WeatherStationDataSource.java
index 58f9194d..9aaac8f8 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/WeatherStationDataSource.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/WeatherStationDataSource.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 package no.bioforsk.vips.logic.entity;
 
 import java.io.Serializable;
diff --git a/src/main/java/no/bioforsk/vips/logic/entity/helpers/HstoreHelper.java b/src/main/java/no/bioforsk/vips/logic/entity/helpers/HstoreHelper.java
index 41b9e5e9..d65e235a 100644
--- a/src/main/java/no/bioforsk/vips/logic/entity/helpers/HstoreHelper.java
+++ b/src/main/java/no/bioforsk/vips/logic/entity/helpers/HstoreHelper.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 package no.bioforsk.vips.logic.entity.helpers;
 
 
diff --git a/src/main/java/no/bioforsk/vips/logic/i18n/CharacterEncodingFilter.java b/src/main/java/no/bioforsk/vips/logic/i18n/CharacterEncodingFilter.java
index c1e87c73..f30f234f 100644
--- a/src/main/java/no/bioforsk/vips/logic/i18n/CharacterEncodingFilter.java
+++ b/src/main/java/no/bioforsk/vips/logic/i18n/CharacterEncodingFilter.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 package no.bioforsk.vips.logic.i18n;
 
 import java.io.IOException;
diff --git a/src/main/java/no/bioforsk/vips/logic/scheduling/SchedulingTest.java b/src/main/java/no/bioforsk/vips/logic/scheduling/SchedulingTest.java
index 6d9b6293..92001f85 100644
--- a/src/main/java/no/bioforsk/vips/logic/scheduling/SchedulingTest.java
+++ b/src/main/java/no/bioforsk/vips/logic/scheduling/SchedulingTest.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 package no.bioforsk.vips.logic.scheduling;
 
 import it.sauronsoftware.cron4j.TaskExecutionContext;
diff --git a/src/main/java/no/bioforsk/vips/logic/scheduling/VIPSLogicTaskCollector.java b/src/main/java/no/bioforsk/vips/logic/scheduling/VIPSLogicTaskCollector.java
index 44ded6c5..f76a8797 100644
--- a/src/main/java/no/bioforsk/vips/logic/scheduling/VIPSLogicTaskCollector.java
+++ b/src/main/java/no/bioforsk/vips/logic/scheduling/VIPSLogicTaskCollector.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 package no.bioforsk.vips.logic.scheduling;
 
 import it.sauronsoftware.cron4j.TaskCollector;
diff --git a/src/main/java/no/bioforsk/vips/logic/scheduling/model/ModelRunPreprocessor.java b/src/main/java/no/bioforsk/vips/logic/scheduling/model/ModelRunPreprocessor.java
index e3404193..eaabc754 100644
--- a/src/main/java/no/bioforsk/vips/logic/scheduling/model/ModelRunPreprocessor.java
+++ b/src/main/java/no/bioforsk/vips/logic/scheduling/model/ModelRunPreprocessor.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 package no.bioforsk.vips.logic.scheduling.model;
 
 import no.bioforsk.vips.logic.entity.ForecastConfiguration;
diff --git a/src/main/java/no/bioforsk/vips/logic/scheduling/model/RunAppleScabModelForOrganizationTask.java b/src/main/java/no/bioforsk/vips/logic/scheduling/model/RunAppleScabModelForOrganizationTask.java
index 88398622..00a54705 100644
--- a/src/main/java/no/bioforsk/vips/logic/scheduling/model/RunAppleScabModelForOrganizationTask.java
+++ b/src/main/java/no/bioforsk/vips/logic/scheduling/model/RunAppleScabModelForOrganizationTask.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 package no.bioforsk.vips.logic.scheduling.model;
 
 import it.sauronsoftware.cron4j.Task;
diff --git a/src/main/java/no/bioforsk/vips/logic/service/LogicService.java b/src/main/java/no/bioforsk/vips/logic/service/LogicService.java
index 1adf4f28..3813140e 100644
--- a/src/main/java/no/bioforsk/vips/logic/service/LogicService.java
+++ b/src/main/java/no/bioforsk/vips/logic/service/LogicService.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 package no.bioforsk.vips.logic.service;
 
 import de.micromata.opengis.kml.v_2_2_0.Kml;
diff --git a/src/main/java/no/bioforsk/vips/logic/startup/StartupListener.java b/src/main/java/no/bioforsk/vips/logic/startup/StartupListener.java
index 06f38309..1619516b 100644
--- a/src/main/java/no/bioforsk/vips/logic/startup/StartupListener.java
+++ b/src/main/java/no/bioforsk/vips/logic/startup/StartupListener.java
@@ -1,7 +1,25 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 package no.bioforsk.vips.logic.startup;
 
 import javax.servlet.ServletContextEvent;
-import no.bioforsk.vips.logic.controller.session.SchedulingBean;
 import no.bioforsk.vips.logic.util.SessionControllerGetter;
 
 /**
diff --git a/src/main/java/no/bioforsk/vips/logic/util/Globals.java b/src/main/java/no/bioforsk/vips/logic/util/Globals.java
index d1b4c5ae..b470fc59 100644
--- a/src/main/java/no/bioforsk/vips/logic/util/Globals.java
+++ b/src/main/java/no/bioforsk/vips/logic/util/Globals.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 package no.bioforsk.vips.logic.util;
 
 /**
diff --git a/src/main/java/no/bioforsk/vips/logic/util/StringUtils.java b/src/main/java/no/bioforsk/vips/logic/util/StringUtils.java
index 5f5834e9..a708c1ee 100644
--- a/src/main/java/no/bioforsk/vips/logic/util/StringUtils.java
+++ b/src/main/java/no/bioforsk/vips/logic/util/StringUtils.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 package no.bioforsk.vips.logic.util;
 
 import java.util.Random;
diff --git a/src/main/java/no/bioforsk/vips/logic/util/SystemTime.java b/src/main/java/no/bioforsk/vips/logic/util/SystemTime.java
index 14c80b24..56c35fb5 100644
--- a/src/main/java/no/bioforsk/vips/logic/util/SystemTime.java
+++ b/src/main/java/no/bioforsk/vips/logic/util/SystemTime.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 package no.bioforsk.vips.logic.util;
 
 import java.util.Calendar;
diff --git a/src/main/java/no/bioforsk/web/forms/FormValidation.java b/src/main/java/no/bioforsk/web/forms/FormValidation.java
index e740d2fa..cc6225e1 100644
--- a/src/main/java/no/bioforsk/web/forms/FormValidation.java
+++ b/src/main/java/no/bioforsk/web/forms/FormValidation.java
@@ -1,3 +1,22 @@
+/*
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ */
+
 package no.bioforsk.web.forms;
 
 import java.util.HashMap;
diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index 0b9cbcf5..7229fd15 100644
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ 
+  This file is part of VIPSLogic.
+  VIPSLogic is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+  
+  VIPSLogic is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+  
+  You should have received a copy of the GNU Affero General Public License
+  along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
   <persistence-unit name="VIPSLogic-PU" transaction-type="JTA">
     <jta-data-source>java:/jboss/datasources/vipslogic</jta-data-source>
diff --git a/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts.properties b/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts.properties
index cb9d09df..cb420b01 100644
--- a/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts.properties
+++ b/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts.properties
@@ -1,6 +1,19 @@
-# To change this template, choose Tools | Templates
-# and open the template in the editor.
-
+#    Copyright (C) 2014 Bioforsk
+#    
+#    This file is part of VIPSLogic
+#
+#    VIPSLogic is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    VIPSLogic is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
 invalidcredentials=Invalid username and/or password
 greeting=Welcome to
 logoutsuccess=You are now logged out. Welcome back!
diff --git a/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts_no.properties b/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts_no.properties
index 53b6a771..d0fa4329 100644
--- a/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts_no.properties
+++ b/src/main/resources/no/bioforsk/vips/logic/i18n/vipslogictexts_no.properties
@@ -1,6 +1,19 @@
-# To change this template, choose Tools | Templates
-# and open the template in the editor.
-
+#    Copyright (C) 2014 Bioforsk
+#    
+#    This file is part of VIPSLogic
+#
+#    VIPSLogic is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    VIPSLogic is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
 invalidcredentials=Ugyldig brukernavn og/eller passord
 greeting=Velkommen til
 logoutsuccess=Du er n\u00e5 logget ut. Velkommen tilbake!
diff --git a/src/main/resources/no/bioforsk/vips/logic/i18n/vtpassword.properties b/src/main/resources/no/bioforsk/vips/logic/i18n/vtpassword.properties
index 1d761f2a..95c346ef 100644
--- a/src/main/resources/no/bioforsk/vips/logic/i18n/vtpassword.properties
+++ b/src/main/resources/no/bioforsk/vips/logic/i18n/vtpassword.properties
@@ -1,3 +1,20 @@
+#    Copyright (C) 2014 Bioforsk
+#    
+#    This file is part of VIPSLogic
+#
+#    VIPSLogic is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    VIPSLogic is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+
 # This (and and corresponding localized) property  file(s) 
 # Localizes the error messages given from the vt-password properties files
 # @see UserBean.isPasswordValid() and http://code.google.com/p/vt-middleware/wiki/vtpassword
diff --git a/src/main/resources/no/bioforsk/vips/logic/i18n/vtpassword_no.properties b/src/main/resources/no/bioforsk/vips/logic/i18n/vtpassword_no.properties
index 4e8f7ba7..723d2f2a 100644
--- a/src/main/resources/no/bioforsk/vips/logic/i18n/vtpassword_no.properties
+++ b/src/main/resources/no/bioforsk/vips/logic/i18n/vtpassword_no.properties
@@ -1,3 +1,20 @@
+#    Copyright (C) 2014 Bioforsk
+#    
+#    This file is part of VIPSLogic
+#
+#    VIPSLogic is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    VIPSLogic is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+
 # This (and and corresponding localized) property  file(s) 
 # Localizes the error messages given from the vt-password properties files
 # @see UserBean.isPasswordValid() and http://code.google.com/p/vt-middleware/wiki/vtpassword
diff --git a/src/main/resources/server.properties b/src/main/resources/server.properties
index 8b137891..e2daac3b 100644
--- a/src/main/resources/server.properties
+++ b/src/main/resources/server.properties
@@ -1 +1,16 @@
-
+#    Copyright (C) 2014 Bioforsk
+#    
+#    This file is part of VIPSLogic
+#
+#    VIPSLogic is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    VIPSLogic is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/webapp/WEB-INF/jboss-web.xml b/src/main/webapp/WEB-INF/jboss-web.xml
index 4c21a4d3..0194ff19 100644
--- a/src/main/webapp/WEB-INF/jboss-web.xml
+++ b/src/main/webapp/WEB-INF/jboss-web.xml
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ 
+  This file is part of VIPSLogic.
+  VIPSLogic is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+  
+  VIPSLogic is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+  
+  You should have received a copy of the GNU Affero General Public License
+  along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <jboss-web>
   <context-root>/VIPSLogic</context-root>
 </jboss-web>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index c2e9c9cc..42d1428e 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ 
+  This file is part of VIPSLogic.
+  VIPSLogic is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+  
+  VIPSLogic is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+  
+  You should have received a copy of the GNU Affero General Public License
+  along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
     <display-name>VIPSLogic</display-name>
     <filter-mapping>
diff --git a/src/main/webapp/css/signin.css b/src/main/webapp/css/signin.css
index 89509530..275d747b 100644
--- a/src/main/webapp/css/signin.css
+++ b/src/main/webapp/css/signin.css
@@ -1,3 +1,21 @@
+/* 
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 /* 
     Document   : signin
     Created on : Sep 4, 2013, 10:57:31 AM
diff --git a/src/main/webapp/css/vipslogic.css b/src/main/webapp/css/vipslogic.css
index bada2622..cb8ee6a2 100644
--- a/src/main/webapp/css/vipslogic.css
+++ b/src/main/webapp/css/vipslogic.css
@@ -1,4 +1,22 @@
 /* 
+ * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * 
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
     Document   : stylesheet
     Created on : Aug 28, 2013, 10:55:15 AM
     Author     : Tor-Einar Skog <tor-einar.skog@bioforsk.no>
diff --git a/src/main/webapp/formdefinitions/forecastConfigurationForm.json b/src/main/webapp/formdefinitions/forecastConfigurationForm.json
index 4b8cf2f5..6bacd424 100644
--- a/src/main/webapp/formdefinitions/forecastConfigurationForm.json
+++ b/src/main/webapp/formdefinitions/forecastConfigurationForm.json
@@ -1,4 +1,21 @@
 {
+    "_licenseNote": [
+        "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.",
+        "", 
+        "This file is part of VIPSLogic.",
+        "VIPSLogic is free software: you can redistribute it and/or modify",
+        "it under the terms of the GNU Affero General Public License as published by",
+        "the Free Software Foundation, either version 3 of the License, or",
+        "(at your option) any later version.",
+        "", 
+        "VIPSLogic is distributed in the hope that it will be useful,",
+        "but WITHOUT ANY WARRANTY; without even the implied warranty of",
+        "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the",
+        "GNU Affero General Public License for more details.",
+        "", 
+        "You should have received a copy of the GNU Affero General Public License",
+        "along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>."
+    ],
     "_comment" : "Structure of the forecastConfigurationForm and how to validate it",
     "fields": [
         {
diff --git a/src/main/webapp/formdefinitions/models/APPLESCABM.json b/src/main/webapp/formdefinitions/models/APPLESCABM.json
index ac7f099d..ec90cabb 100644
--- a/src/main/webapp/formdefinitions/models/APPLESCABM.json
+++ b/src/main/webapp/formdefinitions/models/APPLESCABM.json
@@ -1,4 +1,21 @@
 {
+    "_licenseNote": [
+        "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.",
+        "", 
+        "This file is part of VIPSLogic.",
+        "VIPSLogic is free software: you can redistribute it and/or modify",
+        "it under the terms of the GNU Affero General Public License as published by",
+        "the Free Software Foundation, either version 3 of the License, or",
+        "(at your option) any later version.",
+        "", 
+        "VIPSLogic is distributed in the hope that it will be useful,",
+        "but WITHOUT ANY WARRANTY; without even the implied warranty of",
+        "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the",
+        "GNU Affero General Public License for more details.",
+        "", 
+        "You should have received a copy of the GNU Affero General Public License",
+        "along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>."
+    ],
     "_comment" : "Structure of the specific fields for APPLESCABM",
     "fields": [
         {
diff --git a/src/main/webapp/formdefinitions/models/NAERSTADMO.json b/src/main/webapp/formdefinitions/models/NAERSTADMO.json
index f8e40846..0443df94 100644
--- a/src/main/webapp/formdefinitions/models/NAERSTADMO.json
+++ b/src/main/webapp/formdefinitions/models/NAERSTADMO.json
@@ -1,4 +1,21 @@
 {
+    "_licenseNote": [
+        "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.",
+        "", 
+        "This file is part of VIPSLogic.",
+        "VIPSLogic is free software: you can redistribute it and/or modify",
+        "it under the terms of the GNU Affero General Public License as published by",
+        "the Free Software Foundation, either version 3 of the License, or",
+        "(at your option) any later version.",
+        "", 
+        "VIPSLogic is distributed in the hope that it will be useful,",
+        "but WITHOUT ANY WARRANTY; without even the implied warranty of",
+        "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the",
+        "GNU Affero General Public License for more details.",
+        "", 
+        "You should have received a copy of the GNU Affero General Public License",
+        "along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>."
+    ],
     "_comment" : "Structure of the specific fields for NAERSTADMO",
     "fields": [
         {
diff --git a/src/main/webapp/formdefinitions/organismForm.json b/src/main/webapp/formdefinitions/organismForm.json
index 39f99445..21587be9 100644
--- a/src/main/webapp/formdefinitions/organismForm.json
+++ b/src/main/webapp/formdefinitions/organismForm.json
@@ -1,4 +1,21 @@
 {
+    "_licenseNote": [
+        "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.",
+        "", 
+        "This file is part of VIPSLogic.",
+        "VIPSLogic is free software: you can redistribute it and/or modify",
+        "it under the terms of the GNU Affero General Public License as published by",
+        "the Free Software Foundation, either version 3 of the License, or",
+        "(at your option) any later version.",
+        "", 
+        "VIPSLogic is distributed in the hope that it will be useful,",
+        "but WITHOUT ANY WARRANTY; without even the implied warranty of",
+        "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the",
+        "GNU Affero General Public License for more details.",
+        "", 
+        "You should have received a copy of the GNU Affero General Public License",
+        "along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>."
+    ],
     "_comment" : "Structure of the organismForm and how to validate it",
     "fields": [
         {
diff --git a/src/main/webapp/formdefinitions/taskHistoryDateForm.json b/src/main/webapp/formdefinitions/taskHistoryDateForm.json
index d8b2415e..c9b78149 100644
--- a/src/main/webapp/formdefinitions/taskHistoryDateForm.json
+++ b/src/main/webapp/formdefinitions/taskHistoryDateForm.json
@@ -1,4 +1,21 @@
 {
+    "_licenseNote": [
+        "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.",
+        "", 
+        "This file is part of VIPSLogic.",
+        "VIPSLogic is free software: you can redistribute it and/or modify",
+        "it under the terms of the GNU Affero General Public License as published by",
+        "the Free Software Foundation, either version 3 of the License, or",
+        "(at your option) any later version.",
+        "", 
+        "VIPSLogic is distributed in the hope that it will be useful,",
+        "but WITHOUT ANY WARRANTY; without even the implied warranty of",
+        "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the",
+        "GNU Affero General Public License for more details.",
+        "", 
+        "You should have received a copy of the GNU Affero General Public License",
+        "along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>."
+    ],
     "_comment" : "Structure of the taskHistoryDateForm and how to validate it",
     "fields": [
         {
diff --git a/src/main/webapp/formdefinitions/userForm.json b/src/main/webapp/formdefinitions/userForm.json
index fdbb5f73..46ee8580 100644
--- a/src/main/webapp/formdefinitions/userForm.json
+++ b/src/main/webapp/formdefinitions/userForm.json
@@ -1,4 +1,21 @@
 {
+    "_licenseNote": [
+        "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.",
+        "", 
+        "This file is part of VIPSLogic.",
+        "VIPSLogic is free software: you can redistribute it and/or modify",
+        "it under the terms of the GNU Affero General Public License as published by",
+        "the Free Software Foundation, either version 3 of the License, or",
+        "(at your option) any later version.",
+        "", 
+        "VIPSLogic is distributed in the hope that it will be useful,",
+        "but WITHOUT ANY WARRANTY; without even the implied warranty of",
+        "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the",
+        "GNU Affero General Public License for more details.",
+        "", 
+        "You should have received a copy of the GNU Affero General Public License",
+        "along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>."
+    ],
     "_comment" : "Structure of the userForm and how to validate it",
     "fields": [
         {
diff --git a/src/main/webapp/formdefinitions/userRegistrationFormType1.json b/src/main/webapp/formdefinitions/userRegistrationFormType1.json
index aff80676..96adf5f8 100644
--- a/src/main/webapp/formdefinitions/userRegistrationFormType1.json
+++ b/src/main/webapp/formdefinitions/userRegistrationFormType1.json
@@ -1,4 +1,21 @@
 {
+    "_licenseNote": [
+        "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.",
+        "", 
+        "This file is part of VIPSLogic.",
+        "VIPSLogic is free software: you can redistribute it and/or modify",
+        "it under the terms of the GNU Affero General Public License as published by",
+        "the Free Software Foundation, either version 3 of the License, or",
+        "(at your option) any later version.",
+        "", 
+        "VIPSLogic is distributed in the hope that it will be useful,",
+        "but WITHOUT ANY WARRANTY; without even the implied warranty of",
+        "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the",
+        "GNU Affero General Public License for more details.",
+        "", 
+        "You should have received a copy of the GNU Affero General Public License",
+        "along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>."
+    ],
     "_comment" : "Structure of the userRegistrationForm and how to validate it",
     "fields": [
         {
diff --git a/src/main/webapp/formdefinitions/userRegistrationFormType2.json b/src/main/webapp/formdefinitions/userRegistrationFormType2.json
index aa03461b..047dce97 100644
--- a/src/main/webapp/formdefinitions/userRegistrationFormType2.json
+++ b/src/main/webapp/formdefinitions/userRegistrationFormType2.json
@@ -1,4 +1,21 @@
 {
+    "_licenseNote": [
+        "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.",
+        "", 
+        "This file is part of VIPSLogic.",
+        "VIPSLogic is free software: you can redistribute it and/or modify",
+        "it under the terms of the GNU Affero General Public License as published by",
+        "the Free Software Foundation, either version 3 of the License, or",
+        "(at your option) any later version.",
+        "", 
+        "VIPSLogic is distributed in the hope that it will be useful,",
+        "but WITHOUT ANY WARRANTY; without even the implied warranty of",
+        "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the",
+        "GNU Affero General Public License for more details.",
+        "", 
+        "You should have received a copy of the GNU Affero General Public License",
+        "along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>."
+    ],
     "_comment" : "Structure of the userRegistrationForm for OpenId and how to validate it",
     "fields": [
         {
diff --git a/src/main/webapp/formdefinitions/userRegistrationFormType3.json b/src/main/webapp/formdefinitions/userRegistrationFormType3.json
index d3b530ad..aee00e1d 100644
--- a/src/main/webapp/formdefinitions/userRegistrationFormType3.json
+++ b/src/main/webapp/formdefinitions/userRegistrationFormType3.json
@@ -1,4 +1,21 @@
 {
+    "_licenseNote": [
+        "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.",
+        "", 
+        "This file is part of VIPSLogic.",
+        "VIPSLogic is free software: you can redistribute it and/or modify",
+        "it under the terms of the GNU Affero General Public License as published by",
+        "the Free Software Foundation, either version 3 of the License, or",
+        "(at your option) any later version.",
+        "", 
+        "VIPSLogic is distributed in the hope that it will be useful,",
+        "but WITHOUT ANY WARRANTY; without even the implied warranty of",
+        "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the",
+        "GNU Affero General Public License for more details.",
+        "", 
+        "You should have received a copy of the GNU Affero General Public License",
+        "along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>."
+    ],
     "_comment" : "Structure of the userRegistrationForm for GoogleId and how to validate it",
     "fields": [
         {
diff --git a/src/main/webapp/js/validateForm.js b/src/main/webapp/js/validateForm.js
index 4e7b4a35..59c1bc27 100644
--- a/src/main/webapp/js/validateForm.js
+++ b/src/main/webapp/js/validateForm.js
@@ -40,7 +40,7 @@ var fieldTypes= {
     TYPE_SELECT_SINGLE: "SELECT_SINGLE",
     TYPE_SELECT_MULTIPLE: "SELECT_MULTIPLE",
     TYPE_INPUT: "INPUT"
-}
+};
 
 
 var defaultValues = {
@@ -391,7 +391,7 @@ function validateFieldActual(fieldEl, theForm, formDefinitionKey)
     
     
     // Passwords are evaluated in evaluatePassword
-    if(fieldDefinition.dataType === fieldTypes.TYPE_PASSWORD)
+    if(fieldDefinition.dataType === dataTypes.TYPE_PASSWORD)
     {
         return true;
     }
diff --git a/src/main/webapp/templates/error_unknown.ftl b/src/main/webapp/templates/error_unknown.ftl
index 0d9f554f..0a96c638 100644
--- a/src/main/webapp/templates/error_unknown.ftl
+++ b/src/main/webapp/templates/error_unknown.ftl
@@ -1,4 +1,20 @@
-<#include "master.ftl">
+<#-- 
+  Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+
+  This file is part of VIPSLogic.
+  VIPSLogic is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+ 
+  VIPSLogic is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+ 
+  You should have received a copy of the GNU Affero General Public License
+  along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+--><#include "master.ftl">
 <#macro navbar_collapse>
 </#macro>
 <#macro page_head>
diff --git a/src/main/webapp/templates/forecastConfigurationForm.ftl b/src/main/webapp/templates/forecastConfigurationForm.ftl
index b6b11894..2f4212b8 100644
--- a/src/main/webapp/templates/forecastConfigurationForm.ftl
+++ b/src/main/webapp/templates/forecastConfigurationForm.ftl
@@ -1,4 +1,20 @@
-<#include "master.ftl">
+<#-- 
+  Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+
+  This file is part of VIPSLogic.
+  VIPSLogic is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+ 
+  VIPSLogic is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+ 
+  You should have received a copy of the GNU Affero General Public License
+  along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+--><#include "master.ftl">
 <#macro page_head>
         <title></title>
 </#macro>
diff --git a/src/main/webapp/templates/forecastConfigurationList.ftl b/src/main/webapp/templates/forecastConfigurationList.ftl
index 09416bb8..8c2b9048 100644
--- a/src/main/webapp/templates/forecastConfigurationList.ftl
+++ b/src/main/webapp/templates/forecastConfigurationList.ftl
@@ -1,4 +1,20 @@
-<#include "master.ftl">
+<#-- 
+  Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+
+  This file is part of VIPSLogic.
+  VIPSLogic is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+ 
+  VIPSLogic is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+ 
+  You should have received a copy of the GNU Affero General Public License
+  along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+--><#include "master.ftl">
 <#macro page_head>
         <title>${i18nBundle.forecasts}</title>
 </#macro>
diff --git a/src/main/webapp/templates/index.ftl b/src/main/webapp/templates/index.ftl
index 2b56292c..0d7edd52 100644
--- a/src/main/webapp/templates/index.ftl
+++ b/src/main/webapp/templates/index.ftl
@@ -1,4 +1,20 @@
-<#include "master.ftl">
+<#-- 
+  Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+
+  This file is part of VIPSLogic.
+  VIPSLogic is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+ 
+  VIPSLogic is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+ 
+  You should have received a copy of the GNU Affero General Public License
+  along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+--><#include "master.ftl">
 <#macro page_head>
         <title>${i18nBundle.greeting} VIPSLogic</title>
 </#macro>
diff --git a/src/main/webapp/templates/login.ftl b/src/main/webapp/templates/login.ftl
index 7dc7175b..c772638d 100644
--- a/src/main/webapp/templates/login.ftl
+++ b/src/main/webapp/templates/login.ftl
@@ -1,4 +1,20 @@
-<#include "master.ftl">
+<#-- 
+  Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+
+  This file is part of VIPSLogic.
+  VIPSLogic is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+ 
+  VIPSLogic is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+ 
+  You should have received a copy of the GNU Affero General Public License
+  along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+--><#include "master.ftl">
 <#macro page_head>
         <title>${i18nBundle.pleaselogin}</title>
 </#macro>
diff --git a/src/main/webapp/templates/master.ftl b/src/main/webapp/templates/master.ftl
index ea5e81ec..651bad2e 100644
--- a/src/main/webapp/templates/master.ftl
+++ b/src/main/webapp/templates/master.ftl
@@ -1,3 +1,20 @@
+<#-- 
+  Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+
+  This file is part of VIPSLogic.
+  VIPSLogic is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+ 
+  VIPSLogic is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+ 
+  You should have received a copy of the GNU Affero General Public License
+  along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <#macro page_head>
         <title>master title</title>
 </#macro>
diff --git a/src/main/webapp/templates/master_errorpages.ftl b/src/main/webapp/templates/master_errorpages.ftl
index 0e1f0655..703a5989 100644
--- a/src/main/webapp/templates/master_errorpages.ftl
+++ b/src/main/webapp/templates/master_errorpages.ftl
@@ -1,4 +1,20 @@
-<#macro page_head>
+<#-- 
+  Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+
+  This file is part of VIPSLogic.
+  VIPSLogic is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+ 
+  VIPSLogic is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+ 
+  You should have received a copy of the GNU Affero General Public License
+  along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+--><#macro page_head>
         <title>master title</title>
 </#macro>
 <#macro custom_css>
diff --git a/src/main/webapp/templates/organism.ftl b/src/main/webapp/templates/organism.ftl
index b794e11a..8c037650 100644
--- a/src/main/webapp/templates/organism.ftl
+++ b/src/main/webapp/templates/organism.ftl
@@ -1,4 +1,20 @@
-<#include "master.ftl">
+<#-- 
+  Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+
+  This file is part of VIPSLogic.
+  VIPSLogic is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+ 
+  VIPSLogic is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+ 
+  You should have received a copy of the GNU Affero General Public License
+  along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+--><#include "master.ftl">
 <#macro page_head>
         <title>${i18nBundle.organisms}</title>
         
diff --git a/src/main/webapp/templates/organismDetails.ftl b/src/main/webapp/templates/organismDetails.ftl
index e9416f39..d80e1327 100644
--- a/src/main/webapp/templates/organismDetails.ftl
+++ b/src/main/webapp/templates/organismDetails.ftl
@@ -1,4 +1,20 @@
-<#include "master.ftl">
+<#-- 
+  Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+
+  This file is part of VIPSLogic.
+  VIPSLogic is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+ 
+  VIPSLogic is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+ 
+  You should have received a copy of the GNU Affero General Public License
+  along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+--><#include "master.ftl">
 <#macro page_head>
         <title>${organism.getLocalName(currentLocale.language)!""}<#if organism.tradeName?has_content> / ${organism.tradeName}</#if> (${organism.latinName!""})</title>
 </#macro>
diff --git a/src/main/webapp/templates/poi.ftl b/src/main/webapp/templates/poi.ftl
index a0a4e08c..07df53d5 100644
--- a/src/main/webapp/templates/poi.ftl
+++ b/src/main/webapp/templates/poi.ftl
@@ -1,4 +1,20 @@
-<#include "master.ftl">
+<#-- 
+  Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+
+  This file is part of VIPSLogic.
+  VIPSLogic is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+ 
+  VIPSLogic is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+ 
+  You should have received a copy of the GNU Affero General Public License
+  along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+--><#include "master.ftl">
 <#macro page_head>
         <title>POI</title>
 </#macro>
diff --git a/src/main/webapp/templates/registerOpenIdForm.ftl b/src/main/webapp/templates/registerOpenIdForm.ftl
index 73564aa6..e4df7310 100644
--- a/src/main/webapp/templates/registerOpenIdForm.ftl
+++ b/src/main/webapp/templates/registerOpenIdForm.ftl
@@ -1,4 +1,20 @@
-<#include "master.ftl">
+<#-- 
+  Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+
+  This file is part of VIPSLogic.
+  VIPSLogic is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+ 
+  VIPSLogic is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+ 
+  You should have received a copy of the GNU Affero General Public License
+  along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+--><#include "master.ftl">
 <#macro page_head>
         <title>${i18nBundle.pleaselogin}</title>
 </#macro>
diff --git a/src/main/webapp/templates/taskHistoryDetails.ftl b/src/main/webapp/templates/taskHistoryDetails.ftl
index 0d869198..c3b1543a 100644
--- a/src/main/webapp/templates/taskHistoryDetails.ftl
+++ b/src/main/webapp/templates/taskHistoryDetails.ftl
@@ -1,4 +1,20 @@
-<#include "master.ftl">
+<#-- 
+  Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+
+  This file is part of VIPSLogic.
+  VIPSLogic is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+ 
+  VIPSLogic is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+ 
+  You should have received a copy of the GNU Affero General Public License
+  along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+--><#include "master.ftl">
 <#macro page_head>
         <title>${i18nBundle.taskHistoryDetails}</title>
 </#macro>
diff --git a/src/main/webapp/templates/taskList.ftl b/src/main/webapp/templates/taskList.ftl
index b46b8d4f..00b3a15e 100644
--- a/src/main/webapp/templates/taskList.ftl
+++ b/src/main/webapp/templates/taskList.ftl
@@ -1,4 +1,20 @@
-<#include "master.ftl">
+<#-- 
+  Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+
+  This file is part of VIPSLogic.
+  VIPSLogic is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+ 
+  VIPSLogic is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+ 
+  You should have received a copy of the GNU Affero General Public License
+  along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+--><#include "master.ftl">
 <#macro page_head>
         <title>${i18nBundle.tasks}</title>
 </#macro>
diff --git a/src/main/webapp/templates/userForm.ftl b/src/main/webapp/templates/userForm.ftl
index af9cb601..cbeb2bd7 100644
--- a/src/main/webapp/templates/userForm.ftl
+++ b/src/main/webapp/templates/userForm.ftl
@@ -1,4 +1,20 @@
-<#include "master.ftl">
+<#-- 
+  Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+
+  This file is part of VIPSLogic.
+  VIPSLogic is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+ 
+  VIPSLogic is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+ 
+  You should have received a copy of the GNU Affero General Public License
+  along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+--><#include "master.ftl">
 <#macro page_head>
         <title>${i18nBundle.user}</title>
 </#macro>
diff --git a/src/main/webapp/templates/userList.ftl b/src/main/webapp/templates/userList.ftl
index 7cb9df7b..5ec0d867 100644
--- a/src/main/webapp/templates/userList.ftl
+++ b/src/main/webapp/templates/userList.ftl
@@ -1,4 +1,20 @@
-<#include "master.ftl">
+<#-- 
+  Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+
+  This file is part of VIPSLogic.
+  VIPSLogic is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+ 
+  VIPSLogic is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+ 
+  You should have received a copy of the GNU Affero General Public License
+  along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+--><#include "master.ftl">
 <#macro page_head>
         <title>${i18nBundle.users}</title>
 </#macro>
diff --git a/src/main/webapp/templates/userRegistrationForm.ftl b/src/main/webapp/templates/userRegistrationForm.ftl
index 30252a1d..92115236 100644
--- a/src/main/webapp/templates/userRegistrationForm.ftl
+++ b/src/main/webapp/templates/userRegistrationForm.ftl
@@ -1,4 +1,20 @@
-<#include "master.ftl">
+<#-- 
+  Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+
+  This file is part of VIPSLogic.
+  VIPSLogic is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+ 
+  VIPSLogic is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+ 
+  You should have received a copy of the GNU Affero General Public License
+  along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+--><#include "master.ftl">
 <#macro page_head>
         <title>${i18nBundle.registerNewUser}</title>
 </#macro>
diff --git a/src/main/webapp/templates/weatherstation.ftl b/src/main/webapp/templates/weatherstation.ftl
index a70a8dbe..3f1eace0 100644
--- a/src/main/webapp/templates/weatherstation.ftl
+++ b/src/main/webapp/templates/weatherstation.ftl
@@ -1,4 +1,20 @@
-<#include "master.ftl">
+<#-- 
+  Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+
+  This file is part of VIPSLogic.
+  VIPSLogic is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+ 
+  VIPSLogic is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+ 
+  You should have received a copy of the GNU Affero General Public License
+  along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+--><#include "master.ftl">
 <#macro page_head>
         <title>${weatherStation.name}</title>
         
diff --git a/src/main/webapp/templates/weatherstationform.ftl b/src/main/webapp/templates/weatherstationform.ftl
index 9e506a88..51884a95 100644
--- a/src/main/webapp/templates/weatherstationform.ftl
+++ b/src/main/webapp/templates/weatherstationform.ftl
@@ -1,4 +1,20 @@
-<#include "master.ftl">
+<#-- 
+  Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+
+  This file is part of VIPSLogic.
+  VIPSLogic is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+ 
+  VIPSLogic is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+ 
+  You should have received a copy of the GNU Affero General Public License
+  along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+--><#include "master.ftl">
 <#macro page_head>
         <title>${i18nBundle.edit} ${weatherStation.name}</title>
         
diff --git a/src/main/webapp/templates/weatherstationlist.ftl b/src/main/webapp/templates/weatherstationlist.ftl
index 5ea6a11a..bd466d3a 100644
--- a/src/main/webapp/templates/weatherstationlist.ftl
+++ b/src/main/webapp/templates/weatherstationlist.ftl
@@ -1,4 +1,20 @@
-<#include "master.ftl">
+<#-- 
+  Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+
+  This file is part of VIPSLogic.
+  VIPSLogic is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+ 
+  VIPSLogic is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+ 
+  You should have received a copy of the GNU Affero General Public License
+  along with VIPSLogic.  If not, see <http://www.gnu.org/licenses/>.
+--><#include "master.ftl">
 <#macro page_head>
         <title>${i18nBundle.weatherStations}</title>
 </#macro>
diff --git a/src/test/resources/Untitled Document 1 b/src/test/resources/Untitled Document 1
deleted file mode 100644
index 4246a054..00000000
--- a/src/test/resources/Untitled Document 1	
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="form-group">
-<label for="calculationStart">Beregningsstart</label>
-<input class="form-control" type="datetime" onblur="validateField(this,'NAERSTADMO');" placeholder="Beregningsstart" name="calculationStart">
-<span id="forecastConfigurationForm_calculationStart_validation" class="help-block"></span>
-</div>
-<div class="form-group">
-<label for="calculationEnd">Beregningsslutt</label>
-<input class="form-control" type="datetime" onblur="validateField(this,'NAERSTADMO');" placeholder="Beregningsslutt" name="calculationEnd">
-<span id="forecastConfigurationForm_calculationEnd_validation" class="help-block"></span>
-</div>
-- 
GitLab