diff --git a/nb-configuration.xml b/nb-configuration.xml
index 4e3da122e8b65b94f0568fb43b1dcaff88d35e25..be09b10ca12e046a6fc3f413bdb8323448918b1e 100644
--- a/nb-configuration.xml
+++ b/nb-configuration.xml
@@ -15,5 +15,6 @@ Any value defined here will override the pom.xml file value but is only applicab
 -->
         <netbeans.hint.j2eeVersion>1.5</netbeans.hint.j2eeVersion>
         <org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>ide</org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>
+        <netbeans.hint.license>bioforsk_open_source_license.ftl</netbeans.hint.license>
     </properties>
 </project-shared-configuration>
diff --git a/src/main/java/no/bioforsk/vips/coremanager/VIPSCoreManagerApplication.java b/src/main/java/no/bioforsk/vips/coremanager/VIPSCoreManagerApplication.java
index 6c96d4ff2f570ee18f662c5501b5b30a510b4f1e..80bcd65f78b276262c0be4bbbf4337e06d96165c 100644
--- a/src/main/java/no/bioforsk/vips/coremanager/VIPSCoreManagerApplication.java
+++ b/src/main/java/no/bioforsk/vips/coremanager/VIPSCoreManagerApplication.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCoreManager.
  * VIPSCoreManager 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.
+ * it under the terms of the Bioforsk Open Source License as published by 
+ * Bioforsk, either version 1 of the License, or (at your option) any
+ * later version.
  * 
  * VIPSCoreManager 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.
+ * Bioforsk Open Source License for more details.
  * 
- * You should have received a copy of the GNU Affero General Public License
- * along with VIPSCoreManager.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/coremanager/entity/ModelUsageLog.java b/src/main/java/no/bioforsk/vips/coremanager/entity/ModelUsageLog.java
index a5722e0dc316b9dd24ef4339a32924d5a8686b39..a7947b94b45eab1bbe074c7abca24ace6b4ef117 100644
--- a/src/main/java/no/bioforsk/vips/coremanager/entity/ModelUsageLog.java
+++ b/src/main/java/no/bioforsk/vips/coremanager/entity/ModelUsageLog.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCoreManager.
  * VIPSCoreManager 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.
+ * it under the terms of the Bioforsk Open Source License as published by 
+ * Bioforsk, either version 1 of the License, or (at your option) any
+ * later version.
  * 
  * VIPSCoreManager 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.
+ * Bioforsk Open Source License for more details.
  * 
- * You should have received a copy of the GNU Affero General Public License
- * along with VIPSCoreManager.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/coremanager/entity/Organization.java b/src/main/java/no/bioforsk/vips/coremanager/entity/Organization.java
index e998967b9637534d7fd3016b46c4b4f9071a4b07..0f17882fd061018540aa9a9e6b510595d7f77404 100644
--- a/src/main/java/no/bioforsk/vips/coremanager/entity/Organization.java
+++ b/src/main/java/no/bioforsk/vips/coremanager/entity/Organization.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCoreManager.
  * VIPSCoreManager 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.
+ * it under the terms of the Bioforsk Open Source License as published by 
+ * Bioforsk, either version 1 of the License, or (at your option) any
+ * later version.
  * 
  * VIPSCoreManager 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.
+ * Bioforsk Open Source License for more details.
  * 
- * You should have received a copy of the GNU Affero General Public License
- * along with VIPSCoreManager.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/coremanager/entity/VIPSCoreCredentials.java b/src/main/java/no/bioforsk/vips/coremanager/entity/VIPSCoreCredentials.java
index 6e2f1b0187ebf58693f698e9f20732fb67761fbf..5fb3080b9df244311c23b5ebacdd94978c944a8c 100644
--- a/src/main/java/no/bioforsk/vips/coremanager/entity/VIPSCoreCredentials.java
+++ b/src/main/java/no/bioforsk/vips/coremanager/entity/VIPSCoreCredentials.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCoreManager.
  * VIPSCoreManager 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.
+ * it under the terms of the Bioforsk Open Source License as published by 
+ * Bioforsk, either version 1 of the License, or (at your option) any
+ * later version.
  * 
  * VIPSCoreManager 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.
+ * Bioforsk Open Source License for more details.
  * 
- * You should have received a copy of the GNU Affero General Public License
- * along with VIPSCoreManager.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/coremanager/entity/VipsCoreUser.java b/src/main/java/no/bioforsk/vips/coremanager/entity/VipsCoreUser.java
index f5c1fa6249d6ce07de774d7f6a6b9032fbf24b29..e519a96dfa678bfd3467533b0ad4e1947d0fa585 100644
--- a/src/main/java/no/bioforsk/vips/coremanager/entity/VipsCoreUser.java
+++ b/src/main/java/no/bioforsk/vips/coremanager/entity/VipsCoreUser.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCoreManager.
  * VIPSCoreManager 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.
+ * it under the terms of the Bioforsk Open Source License as published by 
+ * Bioforsk, either version 1 of the License, or (at your option) any
+ * later version.
  * 
  * VIPSCoreManager 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.
+ * Bioforsk Open Source License for more details.
  * 
- * You should have received a copy of the GNU Affero General Public License
- * along with VIPSCoreManager.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/coremanager/service/JsonParseExceptionMapper.java b/src/main/java/no/bioforsk/vips/coremanager/service/JsonParseExceptionMapper.java
index 265864121ff825067561e160d49fe11eed3eaea8..31cd3be42794ca1bd3d060857a318bd268953ac2 100644
--- a/src/main/java/no/bioforsk/vips/coremanager/service/JsonParseExceptionMapper.java
+++ b/src/main/java/no/bioforsk/vips/coremanager/service/JsonParseExceptionMapper.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCoreManager.
  * VIPSCoreManager 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.
+ * it under the terms of the Bioforsk Open Source License as published by 
+ * Bioforsk, either version 1 of the License, or (at your option) any
+ * later version.
  * 
  * VIPSCoreManager 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.
+ * Bioforsk Open Source License for more details.
  * 
- * You should have received a copy of the GNU Affero General Public License
- * along with VIPSCoreManager.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/coremanager/service/ManagerResourceImpl.java b/src/main/java/no/bioforsk/vips/coremanager/service/ManagerResourceImpl.java
index 7c582a2322175d6d5c6a2117ccd8a9af41716cb0..73d516bfe19e298d5717dfad5dc66e5596071d92 100644
--- a/src/main/java/no/bioforsk/vips/coremanager/service/ManagerResourceImpl.java
+++ b/src/main/java/no/bioforsk/vips/coremanager/service/ManagerResourceImpl.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCoreManager.
  * VIPSCoreManager 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.
+ * it under the terms of the Bioforsk Open Source License as published by 
+ * Bioforsk, either version 1 of the License, or (at your option) any
+ * later version.
  * 
  * VIPSCoreManager 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.
+ * Bioforsk Open Source License for more details.
  * 
- * You should have received a copy of the GNU Affero General Public License
- * along with VIPSCoreManager.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/coremanager/session/ControllerGetter.java b/src/main/java/no/bioforsk/vips/coremanager/session/ControllerGetter.java
index 908fdd48f3438bf5223af291151ce1f143bd1503..232df698cd0424c0dbb16d7747d52ce0518bfae3 100644
--- a/src/main/java/no/bioforsk/vips/coremanager/session/ControllerGetter.java
+++ b/src/main/java/no/bioforsk/vips/coremanager/session/ControllerGetter.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCoreManager.
  * VIPSCoreManager 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.
+ * it under the terms of the Bioforsk Open Source License as published by 
+ * Bioforsk, either version 1 of the License, or (at your option) any
+ * later version.
  * 
  * VIPSCoreManager 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.
+ * Bioforsk Open Source License for more details.
  * 
- * You should have received a copy of the GNU Affero General Public License
- * along with VIPSCoreManager.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/java/no/bioforsk/vips/coremanager/session/UserController.java b/src/main/java/no/bioforsk/vips/coremanager/session/UserController.java
index 23a3d638fe8e89c21b14e8725f529eb7f86a4798..63dabafa85adf0b9977dab8c293613b75958834e 100644
--- a/src/main/java/no/bioforsk/vips/coremanager/session/UserController.java
+++ b/src/main/java/no/bioforsk/vips/coremanager/session/UserController.java
@@ -3,17 +3,17 @@
  * 
  * This file is part of VIPSCoreManager.
  * VIPSCoreManager 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.
+ * it under the terms of the Bioforsk Open Source License as published by 
+ * Bioforsk, either version 1 of the License, or (at your option) any
+ * later version.
  * 
  * VIPSCoreManager 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.
+ * Bioforsk Open Source License for more details.
  * 
- * You should have received a copy of the GNU Affero General Public License
- * along with VIPSCoreManager.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
  * 
  */
 
diff --git a/src/main/resources/server.properties b/src/main/resources/server.properties
index 28c84cdbdee89d8444e73ed55c23f7d955e8e520..f6e051a57250da39b354f6320e1df4efb55175cf 100644
--- a/src/main/resources/server.properties
+++ b/src/main/resources/server.properties
@@ -1,17 +1,17 @@
-#    Copyright (C) 2014 Bioforsk
-#    
-#    This file is part of VIPSWeb
-#
-#    VIPSWeb 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.
-#
-#    VIPSWeb 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 VIPSWeb.  If not, see <http://www.gnu.org/licenses/>.
+# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# 
+# This file is part of VIPSCoreManager.
+# VIPSCoreManager is free software: you can redistribute it and/or modify
+# it under the terms of the Bioforsk Open Source License as published by 
+# Bioforsk, either version 1 of the License, or (at your option) any
+# later version.
+# 
+# VIPSCoreManager 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
+# Bioforsk Open Source License for more details.
+# 
+# You should have received a copy of the Bioforsk Open Source License
+# along with VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
+# 
 
diff --git a/src/main/webapp/WEB-INF/staticcss/stylesheet.css b/src/main/webapp/WEB-INF/staticcss/stylesheet.css
index add606b790bc41e0882b3882d6d07a8589eca47a..a6c3d6a2d9e6d2f4fba1fdcbda038428b5245b3c 100644
--- a/src/main/webapp/WEB-INF/staticcss/stylesheet.css
+++ b/src/main/webapp/WEB-INF/staticcss/stylesheet.css
@@ -1,20 +1,21 @@
-/* 
+/*
  * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
  * 
  * This file is part of VIPSCoreManager.
  * VIPSCoreManager 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.
+ * it under the terms of the Bioforsk Open Source License as published by 
+ * Bioforsk, either version 1 of the License, or (at your option) any
+ * later version.
  * 
  * VIPSCoreManager 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.
+ * Bioforsk Open Source License for more details.
  * 
- * You should have received a copy of the GNU Affero General Public License
- * along with VIPSCoreManager.  If not, see <http://www.gnu.org/licenses/>.
-*/
+ * You should have received a copy of the Bioforsk Open Source License
+ * along with VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
+ * 
+ */
 /* 
     Document   : stylesheet
     Created on : Sep 25, 2013, 10:27:12 AM
diff --git a/src/main/webapp/WEB-INF/statichtml/index.html b/src/main/webapp/WEB-INF/statichtml/index.html
index dc1d6df29a2ccd744ef2b47506ac71fc04e58591..abbcd7885d9ee9ce035f44e877449f9c6d50bf56 100644
--- a/src/main/webapp/WEB-INF/statichtml/index.html
+++ b/src/main/webapp/WEB-INF/statichtml/index.html
@@ -1,20 +1,20 @@
 <!DOCTYPE html>
 <!--
   Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
- 
+  
   This file is part of VIPSCoreManager.
   VIPSCoreManager 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.
+  it under the terms of the Bioforsk Open Source License as published by 
+  Bioforsk, either version 1 of the License, or (at your option) any
+  later version.
   
   VIPSCoreManager 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.
+  Bioforsk Open Source License for more details.
   
-  You should have received a copy of the GNU Affero General Public License
-  along with VIPSCoreManager.  If not, see <http://www.gnu.org/licenses/>.
+  You should have received a copy of the Bioforsk Open Source License
+  along with VIPSCoreManager.  If not, see <http://www.bioforsk.no/licenses/>.
 -->
 <html>
     <head>