diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index ad49f8b5f59d69a8b70270682109100c9713b91a..ee23b22ae7635839769594e315f95eacebf33aa2 100644
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  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.
-  
-  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.
-  
-  You should have received a copy of the GNU Affero General Public License
-  along with VIPSCoreManager.  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/>.
+ * 
 -->
 <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="VIPSCoreManager-PU" transaction-type="JTA">
diff --git a/src/main/webapp/WEB-INF/beans.xml b/src/main/webapp/WEB-INF/beans.xml
index b279480a3c10d909014ea164f5a27490ab42f464..2e87e5b4412a22ae77e6ee5877df80114818fc27 100644
--- a/src/main/webapp/WEB-INF/beans.xml
+++ b/src/main/webapp/WEB-INF/beans.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  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.
-  
-  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.
-  
-  You should have received a copy of the GNU Affero General Public License
-  along with VIPSCoreManager.  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/>.
+ * 
 -->
 <beans xmlns="http://java.sun.com/xml/ns/javaee"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/src/main/webapp/WEB-INF/jboss-web.xml b/src/main/webapp/WEB-INF/jboss-web.xml
index c7d030b6a2ca270a3c459c95d8ca5cb77d19fca0..ea770aac349ab2f559ca7d554f48ddc08f635d13 100644
--- a/src/main/webapp/WEB-INF/jboss-web.xml
+++ b/src/main/webapp/WEB-INF/jboss-web.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  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.
-  
-  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.
-  
-  You should have received a copy of the GNU Affero General Public License
-  along with VIPSCoreManager.  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/>.
+ * 
 -->
 <jboss-web>
   <context-root>/VIPSCoreManager</context-root>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index b604e60830ac38ed6ac58e75083b37d74f6b6340..4b48ad1bd261726be5edb00e79058ae370649beb 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  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.
-  
-  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.
-  
-  You should have received a copy of the GNU Affero General Public License
-  along with VIPSCoreManager.  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/>.
+ * 
 -->
 <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>VIPSCoreManager</display-name>