diff --git a/src/main/java/no/bioforsk/vips/logic/VIPSLogicApplication.java b/src/main/java/no/bioforsk/vips/logic/VIPSLogicApplication.java
index 342d21df3b3f68e6a58b0f68dbea03cc71b33e73..423abd7cff0bf0cc7ff0d0156fa327cc35257fdb 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 53807a62e5da400560955d61624e760e811ebb31..2223dc36747dd5e4e74f464f743dbe694e80cd43 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 b167e5bbd4328d480cb9d16408eeba778fcac158..a14f7205d7cd3f982ec576ca90f2c4defcea123e 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 7e5f023f2b55887497f6376d5e06af133bc640ec..20584f2697cc00b31845577b87600acf1b16419a 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 30a981d52214200c1fa002f7e40ab67a8fdf481a..a05a3b3c48c1ce2c694a3bdbb84a57747b62384d 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 8f287be2f1bd618599a874d1866dbd3cc6403c1b..afec7f7af23519417aa66ce67a4b229a4c16fb49 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 3ffaabacd8d237cf54318b7b2bdcd6708f97a45b..e534c950cddfb0eb652b95086d93deca44e4f610 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 a42d689cd3738cdabb76765d538757d27d3095d0..46ed5dea14f4b76d3ed4208175d19b994275ab44 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 4bfe992719ae9e988d9e27baa730ad30a60c2265..2a8bc7cc24e46cf2c2f2ceacfa9572ab31310503 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 b26e8741bef98a72345b0cf9e785b00d7a36eb7a..e7857ed74382e7519a72ad4b2e70abd5aeeaef7d 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 15941d6b964dce6e09204095cb4659be9cffdfa9..088fad36dcecd073c5bdba9af26363f70d50676c 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 245d015535caaee742a5a9734faadafdf382d898..5887d6f9b91ccddeab7282fa1299d91eeb3e682d 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 5256648e6799c2073d9209daf631504ed783df37..8cef5772056511ab2a63f7df6e03caa5bcb3cb29 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 5936b1ecdd6f2198a9acdaf05db6d6157f7725ba..07cdc5e4c395082d48daef92b6887802f6a9632c 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 c4a99d811828c6617d9b8b82f90794fb07db1c2e..343cf2e4726aa5405ce48e66ff3cc274f0a3b49b 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 e0af251a62c4eb9fc106b2f89c3bbb8e03bb62b8..8f404502a4705abe77f11185fd71ccb5111fb021 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 537c3ada7ee08b21089cb97d545a9b203b801dad..dc67841e3f08bc55414cb5867618d666ddd210f5 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 0000000000000000000000000000000000000000..139d40faec3e7a2c8c26e22f2845a6e463df6216
--- /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 0000000000000000000000000000000000000000..b7bb95e42ff1c0d558bd7aec60ce1fe4996e80cd
--- /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 0000000000000000000000000000000000000000..827feaad488ed94e9f2f7cdd16b0706c1df23141
--- /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 0000000000000000000000000000000000000000..bc61a1d7746567fdda68eb4940d3f3e992298d35
--- /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 0000000000000000000000000000000000000000..3d716de3879954d6d8747b538af7de9d8b081417
--- /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 0000000000000000000000000000000000000000..fe43b0332e09cd1e306ad166025be5b8a0fa1344
--- /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 4ed6fd0c8321b08d4c9fc18c65827c38ce01004b..1b7d5c041dcf8c7e29a8aa5c345516d169aca6a3 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 5426d7bd3a0138b11d20c290f1322220a2a613ee..8e82b7a2fe4b3ccc6982fb02821b7dc6b94441ab 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 b9b3f148c4ebc4efd4b504b7a1138172c807b4a7..47771a5021aefa0d0e0debd440cbbdea98553854 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 59cdacb43129f34eec8255051af69b788e31e1ae..a2c94e5bc0d88bff96d87f01055df25efd2c7cc4 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 2abc622d892d21aedd94485034022d56d4185c1b..d3ac34b1dfe212655336bb93f696f2195e4dd076 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 ed49bafb9aac05329f2f86e7f43a68621268510e..5c275e7099202e465312442462c700a456f97eb9 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 c6744288fcc2e29167935abd59d4113ec64475a8..76472f8a15100dc79e38b50401fcc0db3aa49bfd 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 1700297c4d57c60932d87b3b0fae65cb8c47702f..f9b2e36ed8c75ea500a5daf9e815efda6236ffa6 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 8f0d3c80e2a10eba04b0295717ca144de3694200..f854565c93d53fe3faca7b66eef3e7f04caa58e4 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 61e0226cc28ef319d4c7e44ff97b82816d9ab931..23587f20255fa37510e24559a4212bc43baaac3e 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 7333a6598d50b6d8d7ab6b991543c3cbb85d3b2d..c1d95d6abba3fb942e03bd4c23054a0f3510e504 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 6f703a6baaa0fd39e8b21e9bf09a61d11aca8c94..9a9916de0b918077c3a4e3dfad5e0139d99e39f2 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 1f743a76da16654f6680a6745079ba66bdaa5673..982d845413cec46f2062cc943117617b93f8fa07 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 58f9194d8f0c1ac2e23c3338c5f7b038a359ad40..9aaac8f85133f2aca6d0ffa0f838c62634b4e8ba 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 41b9e5e9d5de25918538602fc34525ab9c33ba0c..d65e235a062975a460ffe315dca50fea0f2fa8eb 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 c1e87c73b0a6e872227f8d49998769f111635608..f30f234fb3f0510fa426451951ceace83c8c08b9 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 6d9b62933c969e081a6d2c8a9d9309032cc45b64..92001f85f27862b8056851963ef58ca77df08003 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 44ded6c53f42d148afadccad868f389b3558434a..f76a879782ee6590d5b36706cb112d899fe442f6 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 e3404193b12c31ec447f544769e9bd99f67ab5c8..eaabc754b2012bbce1fb0cc7a9d592976f6ae710 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 883986226faa4868095474c28b9395c2a9bed6d4..00a547053348a790bf1e1d176a2a378c614db02b 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 1adf4f288eebf611b08643b5f8bce78ff1232575..3813140ee37cbdb0615fa910b1a5681b4c293358 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 06f38309c2be60f35b78657f86896191d450a9b6..1619516b2424920af0551149363826276ab82ed6 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 d1b4c5ae10e95d4d97502b54c0eb78aa981c73fb..b470fc5940c45b68848d590610bc813d7f1782d7 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 5f5834e93f2b66632f7f07572bb857471d8cd50b..a708c1ee87564280add0b8c3685027578326d7f5 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 14c80b24fb9a6d985add16cab84eb5719b944be6..56c35fb5c2c590cf52e79ab688e0067661d5af82 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 e740d2fa9d76a172181ebd63c6b4fe813106b3c1..cc6225e1afab8f898619d335b9681cb67d2e32d8 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 0b9cbcf5963f093c79e2ec1478445e00508295fa..7229fd15667c13e6c8b29d31a4ac62f0a90b0e99 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 cb9d09df328eda554c8e20a95f0a1c7844711bab..cb420b01bdb0b6da85ec15c3be97d9b882791f80 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 53b6a771ed1820f960ac39e39bf6a55f77a59bac..d0fa43299fb3be8d143635970cd949979f619216 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 1d761f2a296846f03e310cebe940771d245e43b4..95c346efb3692a9c0656ac5386ad4064b4e919e6 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 4e8f7ba7ce707411fb4d317ae1392eb5c0661c71..723d2f2a0706f5b164ededc9400df83fa8cfdafe 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 8b137891791fe96927ad78e64b0aad7bded08bdc..e2daac3bb0ef10ffa6c35e8ff47035f8fd09da18 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 4c21a4d3682290bec2d76cd285f8c13a3d4e1af1..0194ff1939268ce1f3e3e84ab78a2c445dac3a0d 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 c2e9c9ccb0a53affcfe147cb0d24ee783001c214..42d1428e287de7d407891eb628f3642bff677af2 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 89509530318637bfd3b0a3edd8fd723870850984..275d747b1d64a6fde618fbe74b3337561b0f63da 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 bada262226de403db967cff2682a576684985c79..cb8ee6a209ab52005400df7720fedaece888396e 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 4b8cf2f534afe1a88ea86481a086315aef845602..6bacd42451c504a6f9da3c4734d929928ecd6f5f 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 ac7f099d56cbc9e7e0a4f6deacbc7224747818f4..ec90cabba377b660be213ac2a7fd9d965dfb7120 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 f8e40846ab973365567baf366108b4a602ed7c1f..0443df948f66752d285bc139cad10b4ca9eeebd8 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 39f994459a2b8b1e3c0e4d52f2bfa823af12a5fd..21587be9abe62cd58f0ca69d0535c29809f16acf 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 d8b2415eb314ce4d7125131e9bfa50e84937dfe0..c9b7814930ca5859a2bb73c4cb4d23e3f121bb25 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 fdbb5f73a91198c10364c32ca4d78fd4fe1f2856..46ee8580cb5b76e0eb67e35be87022f184cecc94 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 aff8067637ae934720d2f7bcf2ea4749cc009444..96adf5f87bd635d68b815b112bf5f25ad6d00777 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 aa03461bf9012528bee9aed25c2272f9ffdbcac1..047dce9773277e25ec31b098f7ae442f6b553c2f 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 d3b530ad4ef9a5cc002f42c9a9e0c76740c2973e..aee00e1d6682fdd1edac0fd016d184c2892e6012 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 4e7b4a351c462af70f1c6686e7a4c65486e24e0b..59c1bc27dc6b260bf1dcbb65505307c3456a650f 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 0d9f554f4ce3a548f37eff07d466b34c84e53d94..0a96c63849eec2f83a32642197a02468cf34b696 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 b6b1189462f30f9f2ae267be5ef986c3704c3fd4..2f4212b8c553f37a91da4fdb0be91aece821639c 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 09416bb8cd1a0f0ef1e647afe0ad487e0211f8a2..8c2b9048b3764a50908908acd1f66ed1d7a8655e 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 2b56292cc82f62d56a732b812d30a23808a0a07e..0d7edd5285e8becbbdebf590221b12b4370bc905 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 7dc7175bcf537dcde2cb415a110afbee263b1024..c772638daf9ee01847e9e9e81c79c0ae0dd7a034 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 ea5e81ecd359d8ed2f076c6625c5511b16a5cfd3..651bad2ebbbdb7daf08855c5c159ff8482d5e6d2 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 0e1f0655342778b0608360375de9b1cd77b9588c..703a598917ea459db0c62b97778f63aa81d9ebd7 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 b794e11a7be92ef5bd042afd5484c6941e74b46d..8c037650f1a377380abf6e5f23dfb14b580586b5 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 e9416f39b5937dda3e771dfcb9c94a2c5fbe5519..d80e1327cd4e2fd76a8679457c10e8e674aa9cca 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 a0a4e08c66315361a8e2345176a813b9537b5ada..07df53d58335c8a0097ec224d2a8dd0376591839 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 73564aa6ddd94effd9ee430e27090fec8d5629f5..e4df73104911e574bf15c6c5bf87303952961260 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 0d8691983c2f55a02f4ea0ad206c837e75be3f94..c3b1543a1bd8d79977ca000b5f0214577bcdebc9 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 b46b8d4fb891413f4a1def4e80eebe65006f235e..00b3a15e5fa2c676faea741c89ad8fc62ce20927 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 af9cb601af1f7e0fc0f8f199020a46fa3c191946..cbeb2bd76113e7b80a2be79f18e6a860bd1a6942 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 7cb9df7b0b28f710458dfb75d041264eebd82f5b..5ec0d867eb71a793e3baed6263c60535ddc4d5b3 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 30252a1d858d1baf15ba13043323ad376ea58d9c..921152363d67e593934b21ee8a6461e37f39bc35 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 a70a8dbe37c4e9980b59cae46678a5dccb81bac3..3f1eace09bedbe44e088bbdc37f14fcab9811235 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 9e506a88a746755dc214b9b34265b2d378d1ef22..51884a95bef7ac6c436719e5ca795db5318338bd 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 5ea6a11a7e6ad467778267bd6f1829d2e818f04a..bd466d3a95550c0920b4e1327f8ccef766d6cd0d 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 4246a054322546aac1c88b8bab76d05bede9ad2a..0000000000000000000000000000000000000000
--- 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>