diff --git a/LICENSE.txt b/LICENSE.txt
index 703c9b99ed0921107ef0a59a0aeb1d7d5a0d4950..940d3ebfb3de2496fc19d3844af5902f3dbebdad 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -44,17 +44,17 @@ this license set forward by yourself or any party deviating its rights from you.
  
 	This file is part of <application name>. <application name> 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 
+	the NIBIO Open Source License as published by NIBIO, either 
 	version 1 of the License, or (at your option) any later version.
 
 	<application name> 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.
+	NIBIO Open Source License for more details.
 
-	You should have received a copy of the Bioforsk Open Source License
+	You should have received a copy of the NIBIO Open Source License
 	along with <application name>.  If not, see 
-	<http://www.bioforsk.no/licenses/>.
+	<http://www.nibio.no/licenses/>.
 
       It is also recommended that you add information on how to contact you by 
       electronic and paper mail.
diff --git a/VIPSWeb/context_processors.py b/VIPSWeb/context_processors.py
index ffa835b14bf17b2396b8965f54b4416432cd9952..c401f6cbd48eca91ca8156544db3977790c89dd1 100644
--- a/VIPSWeb/context_processors.py
+++ b/VIPSWeb/context_processors.py
@@ -1,19 +1,19 @@
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb 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
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 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
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 # 
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 
 from django.conf import settings as _settings
diff --git a/VIPSWeb/local_settings_sample.py b/VIPSWeb/local_settings_sample.py
index 57183d3271c6fc094485273ac92f52a3b0448f0c..eaa8b916dcc83ae9bd98c4d091e82d5f6d25667b 100644
--- a/VIPSWeb/local_settings_sample.py
+++ b/VIPSWeb/local_settings_sample.py
@@ -1,19 +1,19 @@
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb 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
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 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
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 # 
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 
 ## SAMPLE local_settings file. Copy to local_settings.py and configure as needed.
diff --git a/VIPSWeb/locale/bg/LC_MESSAGES/django.po b/VIPSWeb/locale/bg/LC_MESSAGES/django.po
index f4edd04966c7585cdae1b839b73b291e61c940c6..fbe2e986314406e25b1a8d37a8f7feaf8cc58452 100644
--- a/VIPSWeb/locale/bg/LC_MESSAGES/django.po
+++ b/VIPSWeb/locale/bg/LC_MESSAGES/django.po
@@ -1,4 +1,4 @@
-#    Copyright (C) 2014 Bioforsk
+#    Copyright (C) 2014 NIBIO
 #
 #    This file is part of VIPSWeb
 #
diff --git a/VIPSWeb/locale/bg/LC_MESSAGES/djangojs.po b/VIPSWeb/locale/bg/LC_MESSAGES/djangojs.po
index af693a2aaa64fb3ab550a0a474cea4284bef9cae..92187c6f052cd46da854f50f974aef1f753d324a 100644
--- a/VIPSWeb/locale/bg/LC_MESSAGES/djangojs.po
+++ b/VIPSWeb/locale/bg/LC_MESSAGES/djangojs.po
@@ -1,4 +1,4 @@
-#    Copyright (C) 2014 Bioforsk
+#    Copyright (C) 2014 NIBIO
 #
 #    This file is part of VIPSWeb
 #
diff --git a/VIPSWeb/locale/nb/LC_MESSAGES/django.po b/VIPSWeb/locale/nb/LC_MESSAGES/django.po
index 8dfe131577efe59990e6149aa7fa2903b0ed9d28..103493a13f9662a08820be1446c21b79b96b6283 100644
--- a/VIPSWeb/locale/nb/LC_MESSAGES/django.po
+++ b/VIPSWeb/locale/nb/LC_MESSAGES/django.po
@@ -1,4 +1,4 @@
-#    Copyright (C) 2014 Bioforsk
+#    Copyright (C) 2014 NIBIO
 #    
 #    This file is part of VIPSWeb
 #
@@ -22,7 +22,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-06-03 15:34+0200\n"
 "PO-Revision-Date: 2013-11-07 20:18+0200\n"
-"Last-Translator: Tor-Einar Skog <tor-einar.skog@bioforsk.no>\n"
+"Last-Translator: Tor-Einar Skog <tor-einar.skog@nibio.no>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
diff --git a/VIPSWeb/locale/nb/LC_MESSAGES/djangojs.po b/VIPSWeb/locale/nb/LC_MESSAGES/djangojs.po
index eb3442226f4fa99d62faa5a1c1ad691073a71be3..85f342a5533486843dd8346a445aec9ebe277119 100644
--- a/VIPSWeb/locale/nb/LC_MESSAGES/djangojs.po
+++ b/VIPSWeb/locale/nb/LC_MESSAGES/djangojs.po
@@ -1,18 +1,18 @@
-#    Copyright (C) 2014 Bioforsk
+#    Copyright (C) 2014 NIBIO
 #    
 #    This file is part of VIPSWeb
 #    VIPSWeb 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
+#    it under the terms of the NIBIO Open Source License as published by 
+#    NIBIO, either version 1 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
-#    Bioforsk Open Source License for more details.
+#    NIBIO Open Source License for more details.
 #
-#    You should have received a copy of the Bioforsk Open Source License
-#    along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+#    You should have received a copy of the NIBIO Open Source License
+#    along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 #
 #, fuzzy
 msgid ""
@@ -21,7 +21,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-06-04 10:29+0200\n"
 "PO-Revision-Date: 2014-12-28 15:17+0100\n"
-"Last-Translator: Tor-Einar Skog <tor-einar.skog@bioforsk.no>\n"
+"Last-Translator: Tor-Einar Skog <tor-einar.skog@nibio.no>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
diff --git a/VIPSWeb/settings.py b/VIPSWeb/settings.py
index ca2674ca5937b56d77f14a4fabd227c725659edf..c95c3a3672e5c13c320ac3089566a80d138e58d1 100644
--- a/VIPSWeb/settings.py
+++ b/VIPSWeb/settings.py
@@ -1,19 +1,19 @@
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb 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
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 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
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 
 # Django settings for VIPSWeb project.
diff --git a/VIPSWeb/static/css/vipsweb.css b/VIPSWeb/static/css/vipsweb.css
index 5f5a4e1e116c75c5cef2039f37f9e23594237b6c..66e6d13c581405ca4c1ad00d4f2823b86ce2c4f5 100644
--- a/VIPSWeb/static/css/vipsweb.css
+++ b/VIPSWeb/static/css/vipsweb.css
@@ -1,26 +1,26 @@
 /*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
  * 
  * This file is part of VIPSWeb.
  * VIPSWeb 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
+ * it under the terms of the NIBIO Open Source License as published by 
+ * NIBIO, either version 1 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
- * Bioforsk Open Source License for more details.
+ * NIBIO Open Source License for more details.
  * 
- * You should have received a copy of the Bioforsk Open Source License
- * along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
  * 
  */
 
 /* 
     Document   : vipsweb.css
     Created on : Nov 7, 2013, 10:55:15 AM
-    Author     : Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+    Author     : Tor-Einar Skog <tor-einar.skog@nibio.no>
     Description:
         Main stylesheet of the VIPSWeb web app. Cusomizes the bootstrap.css and 
         other frameworks (e.g. OpenLayers)
diff --git a/VIPSWeb/static/js/forecastmap.js b/VIPSWeb/static/js/forecastmap.js
index 10df87e8f8a4027539f6ae450c7464ffcbbe9cc7..e0e1cc405e784a3cef5f77721fd028a35fdd6c6f 100644
--- a/VIPSWeb/static/js/forecastmap.js
+++ b/VIPSWeb/static/js/forecastmap.js
@@ -1,25 +1,25 @@
 /*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
  * 
  * This file is part of VIPSWeb.
  * VIPSWeb 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
+ * it under the terms of the NIBIO Open Source License as published by 
+ * NIBIO, either version 1 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
- * Bioforsk Open Source License for more details.
+ * NIBIO Open Source License for more details.
  * 
- * You should have received a copy of the Bioforsk Open Source License
- * along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
  * 
  */
 
 /**
- * @copyright 2014 <a href="http://www.bioforsk.no/">Bioforsk</a>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2014 <a href="http://www.nibio.no/">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
  */
 
 // Couple of global elements
diff --git a/VIPSWeb/static/js/frontpage.js b/VIPSWeb/static/js/frontpage.js
index 46669b6133a3e7ebd42d62b608cf01d187f34a11..ca2963ee309e7a5bae06085efc00c2976063a397 100644
--- a/VIPSWeb/static/js/frontpage.js
+++ b/VIPSWeb/static/js/frontpage.js
@@ -1,19 +1,19 @@
 /*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
  * 
  * This file is part of VIPSWeb.
  * VIPSWeb 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
+ * it under the terms of the NIBIO Open Source License as published by 
+ * NIBIO, either version 1 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
- * Bioforsk Open Source License for more details.
+ * NIBIO Open Source License for more details.
  * 
- * You should have received a copy of the Bioforsk Open Source License
- * along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
  * 
  */
 
@@ -23,7 +23,7 @@
  * 
  * Depending on /currentLanguage.js
  *
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
  */
 
 
diff --git a/VIPSWeb/static/js/js_apps/oatFloweringModelForm.js b/VIPSWeb/static/js/js_apps/oatFloweringModelForm.js
index bc283346baa2951022edc5213bc22e321c4c828f..3e5d511ba4e9d621d843f0223a47f9aceb761a3d 100644
--- a/VIPSWeb/static/js/js_apps/oatFloweringModelForm.js
+++ b/VIPSWeb/static/js/js_apps/oatFloweringModelForm.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
  * 
  * This file is part of VIPSWeb.
  * VIPSWeb is free software: you can redistribute it and/or modify
@@ -24,7 +24,7 @@
  * 	<li>the oat flowering model in the VIPS forecasting system </li>
  * 	<li>moment.js and moment-timezone.js (http://momentjs.com)</li>
  * </ul>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
  */
 
 // *********** Configuration section ****************
@@ -35,14 +35,14 @@ var detailURL = null;
 var DEBUG = false;
 
 // Settings for VIPS forecasting system
-var serverUri = "https://coremanager.vips.bioforsk.no";
+var serverUri = "https://coremanager.vips.nibio.no";
 //var serverUri = "http://vipscoremanager";
 var runUri= serverUri + "/models/OATFLOWERM/run"; 
 var coreUserName = "";
 var corePass = "";
 
 // Location of weather data source
-var weatherDataBaseUri = "http://lmt.bioforsk.no/agrometbase/export/getSeasonDailyTemperaturesJSON.php";
+var weatherDataBaseUri = "http://lmt.nibio.no/agrometbase/export/getSeasonDailyTemperaturesJSON.php";
 //var weatherDataBaseUri = "http://agrometbase-local/agrometbase/export/getSeasonDailyTemperaturesJSON.php";
 
 // Setting current time
diff --git a/VIPSWeb/static/js/util.js b/VIPSWeb/static/js/util.js
index 5be96581255d8ef8bc4a8bd480326a18404c02ed..e5940fa2a14860735986c17a3ae51115e3823552 100644
--- a/VIPSWeb/static/js/util.js
+++ b/VIPSWeb/static/js/util.js
@@ -1,26 +1,26 @@
 /*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
  * 
  * This file is part of VIPSWeb.
  * VIPSWeb 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
+ * it under the terms of the NIBIO Open Source License as published by 
+ * NIBIO, either version 1 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
- * Bioforsk Open Source License for more details.
+ * NIBIO Open Source License for more details.
  * 
- * You should have received a copy of the Bioforsk Open Source License
- * along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
  * 
  */
 
 /**
  * Utility JavaScript. Used here and there. To whom it may concern... 
  *
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
  */
 
 /**
diff --git a/VIPSWeb/static/js/validateForm.js b/VIPSWeb/static/js/validateForm.js
index b320e680bd5c60bc0b669df5d59bdcabf3a17481..d32b95fdb31bda835fc3eb6d9cd8e4a17a3c4f06 100644
--- a/VIPSWeb/static/js/validateForm.js
+++ b/VIPSWeb/static/js/validateForm.js
@@ -60,7 +60,7 @@ var emailReg = /^([\w-\.]+@([\w-]+\.)+[\w-]{2,4})?$/;
 /**
  * Validation function for all forms
  * @copyright 2013 <a href="http://www.nibio.no/">NIBIO</a>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
  * 
  * It depends on the following:
  * <ul>
diff --git a/VIPSWeb/templates/base.html b/VIPSWeb/templates/base.html
index 38ad6345d85322fc67f3654e5483557cd98a3811..b4908f1223388f9b3454744253dc5edf59ab76fb 100644
--- a/VIPSWeb/templates/base.html
+++ b/VIPSWeb/templates/base.html
@@ -1,21 +1,21 @@
 {% comment %}
 
  /*
- * Copyright (c) 2015 Bioforsk <http://www.bioforsk.no/>. 
+ * Copyright (c) 2015 NIBIO <http://www.nibio.no/>. 
  * 
  * This file is part of VIPSWeb.
  * VIPSWeb 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
+ * it under the terms of the NIBIO Open Source License as published by 
+ * NIBIO, either version 1 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
- * Bioforsk Open Source License for more details.
+ * NIBIO Open Source License for more details.
  * 
- * You should have received a copy of the Bioforsk Open Source License
- * along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
  * 
  */
  
diff --git a/VIPSWeb/templates/index.html b/VIPSWeb/templates/index.html
index 62e8144d15688d9e7b7fa06e6e51ced3592fcb58..b02f0ea46477000a9b0f71081720fad743c2b7eb 100644
--- a/VIPSWeb/templates/index.html
+++ b/VIPSWeb/templates/index.html
@@ -2,21 +2,21 @@
 {% comment %}
 
 /*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
  * 
  * This file is part of VIPSWeb.
  * VIPSWeb 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
+ * it under the terms of the NIBIO Open Source License as published by 
+ * NIBIO, either version 1 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
- * Bioforsk Open Source License for more details.
+ * NIBIO Open Source License for more details.
  * 
- * You should have received a copy of the Bioforsk Open Source License
- * along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
  * 
  */
  
diff --git a/VIPSWeb/urls.py b/VIPSWeb/urls.py
index 05d8781835f360db8176c0198905c2134801fe5a..5fdf60a2505328f2568fa9192a43a4f5d96b001a 100644
--- a/VIPSWeb/urls.py
+++ b/VIPSWeb/urls.py
@@ -1,19 +1,19 @@
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb 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
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 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
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 
 from django.conf.urls import patterns, include, url
diff --git a/VIPSWeb/views.py b/VIPSWeb/views.py
index 32983910ebd76482810105462ec2d5f9f768eef9..5c0228dc63481937036b279186bf4066ae082760 100644
--- a/VIPSWeb/views.py
+++ b/VIPSWeb/views.py
@@ -1,21 +1,21 @@
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb 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
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 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
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
-# @author: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+# @author: Tor-Einar Skog <tor-einar.skog@nibio.no>
 from django.shortcuts import render
 from django.conf import settings
 from django.utils import translation
diff --git a/VIPSWeb/wsgi.py b/VIPSWeb/wsgi.py
index aa40a57eb7a6c49e2846eaa9381c24ce8cc6ea57..ff8ffae4841294be0c3b1f4021b5a244e343072e 100644
--- a/VIPSWeb/wsgi.py
+++ b/VIPSWeb/wsgi.py
@@ -1,19 +1,19 @@
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb 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
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 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
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 
 """
diff --git a/cerealblotchmodels/static/cerealblotchmodels/formdefinitions/barleyNetBlotchForm.json b/cerealblotchmodels/static/cerealblotchmodels/formdefinitions/barleyNetBlotchForm.json
index 3de2dd8a633d0856ab88072f0ef614c1007204c7..514266136f822601d5955ae9ac68829ad42ca74d 100644
--- a/cerealblotchmodels/static/cerealblotchmodels/formdefinitions/barleyNetBlotchForm.json
+++ b/cerealblotchmodels/static/cerealblotchmodels/formdefinitions/barleyNetBlotchForm.json
@@ -1,20 +1,20 @@
 {
     "_licenseNote": [
-        "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. ",
+        "Copyright (c) 2014 NIBIO <http://www.nibio.no/>. ",
         "",
         "This file is part of VIPSLogic. ",
         "VIPSLogic 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 ",
+        "it under the terms of the NIBIO Open Source License as published by ",
+        "NIBIO, either version 1 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 ",
-        "Bioforsk Open Source License for more details. ",
+        "NIBIO Open Source License for more details. ",
         "",
-        "You should have received a copy of the Bioforsk Open Source License ",
-        "along with VIPSLogic.  If not, see <http://www.bioforsk.no/licenses/>. "
+        "You should have received a copy of the NIBIO Open Source License ",
+        "along with VIPSLogic.  If not, see <http://www.nibio.no/licenses/>. "
     ],
     "_comment" : "Structure of the observationForm and how to validate it",
     "fields": [
diff --git a/cerealblotchmodels/urls.py b/cerealblotchmodels/urls.py
index b5e0bde83b38a27701e0026975f76e18f12bf568..874644ce522862a2a67a9791d8a243a5e08a49d5 100644
--- a/cerealblotchmodels/urls.py
+++ b/cerealblotchmodels/urls.py
@@ -1,19 +1,19 @@
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb 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
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 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
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 from django.conf.urls import patterns, url
 from cerealblotchmodels import views
diff --git a/common/middleware/whodid.py b/common/middleware/whodid.py
index cc90dbfc2d1516569f774f1e69a889b7a2d7ca1b..c0e0fa0f8d8ccf391df2b9e989ce52a19b672042 100644
--- a/common/middleware/whodid.py
+++ b/common/middleware/whodid.py
@@ -1,20 +1,20 @@
 """
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb 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
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 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
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 """
 """
diff --git a/common/util.py b/common/util.py
index 39aaa0f8ebdec832d3a25b37cf3b45154823a9e6..cf2d8d36ddf5161e9a42b35db9064b51aa0cef98 100644
--- a/common/util.py
+++ b/common/util.py
@@ -1,23 +1,23 @@
 # coding: utf-8
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb 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
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 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
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 
-# Author: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+# Author: Tor-Einar Skog <tor-einar.skog@nibio.no>
 
 from datetime import datetime
 
diff --git a/forecasts/admin.py b/forecasts/admin.py
index ff8a8637eb154e94dd677ea034a475b0504d2264..5e79b15998694eef038947471006c68f69b05e37 100644
--- a/forecasts/admin.py
+++ b/forecasts/admin.py
@@ -1,19 +1,19 @@
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb 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
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 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
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 from django.contrib import admin
 from forecasts.models import ResultParameter, MeasurementUnit, ModelGraphParameter, HighChartsType
diff --git a/forecasts/locale/bg/LC_MESSAGES/django.po b/forecasts/locale/bg/LC_MESSAGES/django.po
index 755cbbd321db144bd44bd8a0d1fa421158e57c81..8b049f6637b3339e032ed4aef8a09ee05ed6d372 100644
--- a/forecasts/locale/bg/LC_MESSAGES/django.po
+++ b/forecasts/locale/bg/LC_MESSAGES/django.po
@@ -1,4 +1,4 @@
-#    Copyright (C) 2014 Bioforsk
+#    Copyright (C) 2014 NIBIO
 #
 #    This file is part of VIPSWeb
 #
diff --git a/forecasts/locale/nb/LC_MESSAGES/django.po b/forecasts/locale/nb/LC_MESSAGES/django.po
index 9f205b2d945daaac61d7a5629994021514ff8f13..d8afa179aa12bed567473f166a1dc9cff145d422 100644
--- a/forecasts/locale/nb/LC_MESSAGES/django.po
+++ b/forecasts/locale/nb/LC_MESSAGES/django.po
@@ -1,4 +1,4 @@
-#    Copyright (C) 2014 Bioforsk
+#    Copyright (C) 2014 NIBIO
 #    
 #    This file is part of VIPSWeb
 #
@@ -14,7 +14,7 @@
 #
 #    You should have received a copy of the GNU Affero General Public License
 #    along with VIPSWeb.  If not, see <http://www.gnu.org/licenses/>.
-# Tor-Einar Skog <tor-einar.skog@bioforsk.no>, 2013.
+# Tor-Einar Skog <tor-einar.skog@nibio.no>, 2013.
 #
 #, fuzzy
 msgid ""
diff --git a/forecasts/models.py b/forecasts/models.py
index 3788d360dd5b6d0b89ffef44fee4ed369f5b2630..ad7b6011d7373cf26e1caad5286d438ec6d5496f 100644
--- a/forecasts/models.py
+++ b/forecasts/models.py
@@ -1,20 +1,20 @@
 # coding: utf-8
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb 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
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 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
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 
 from datetime import datetime
diff --git a/forecasts/templates/forecasts/detail.html b/forecasts/templates/forecasts/detail.html
index b2a93bdab384fb15ad2e150ba2cf6894c2ea2ec9..66b1d738e3159df1aa9eb304cebe545d2bfc39b8 100644
--- a/forecasts/templates/forecasts/detail.html
+++ b/forecasts/templates/forecasts/detail.html
@@ -2,21 +2,21 @@
 {% comment %}
 
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb 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
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 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
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 # @author: Tor-Einar Skog 
  
diff --git a/forecasts/templates/forecasts/detail_error.html b/forecasts/templates/forecasts/detail_error.html
index 1928153de3c0ab66d0d1b5ceeda3a5e939136237..0e9259b9c348602e31dd11f670c894e607d58b0a 100644
--- a/forecasts/templates/forecasts/detail_error.html
+++ b/forecasts/templates/forecasts/detail_error.html
@@ -2,21 +2,21 @@
 {% comment %}
 
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb 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
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 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
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 # @author: Tor-Einar Skog 
  
diff --git a/forecasts/templates/forecasts/index.html b/forecasts/templates/forecasts/index.html
index d5b27990a8a49891d42fb25cee6f923bf12a7e4f..e58e436210d08a31d0d186c926c1ab6278621a83 100644
--- a/forecasts/templates/forecasts/index.html
+++ b/forecasts/templates/forecasts/index.html
@@ -3,21 +3,21 @@
 {% comment %}
 
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb 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
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 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
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
  
 {% endcomment %}
diff --git a/forecasts/templates/models/detail.html b/forecasts/templates/models/detail.html
index 6004b40374e5477b04783808e52f143920d7ab68..779973fd14f3ffc869707c7c346ed712d7fbdfbe 100644
--- a/forecasts/templates/models/detail.html
+++ b/forecasts/templates/models/detail.html
@@ -1,21 +1,21 @@
 {% extends "base.html" %}
 {% comment %}
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb 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
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 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
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 {% endcomment %}
 {% load i18n %}
diff --git a/forecasts/templates/models/index.html b/forecasts/templates/models/index.html
index eefbfac93dbf134691310bfda01ad5be08d636e4..e5b8c98f5a793dbc79e81fb7169f7a0508d7ee0a 100644
--- a/forecasts/templates/models/index.html
+++ b/forecasts/templates/models/index.html
@@ -1,21 +1,21 @@
 {% extends "base.html" %}
 {% comment %}
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb 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
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 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
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 {% endcomment %}
 {% load i18n %}
diff --git a/forecasts/templates/models/modelLocalNames.js b/forecasts/templates/models/modelLocalNames.js
index e1fa3352159a0a8aaa600d99f763bdd1a7e9a957..fbcd1cb333e5c64aa235a3a39a9734e44ec98661 100644
--- a/forecasts/templates/models/modelLocalNames.js
+++ b/forecasts/templates/models/modelLocalNames.js
@@ -1,19 +1,19 @@
 /*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
  * 
  * This file is part of VIPSWeb.
  * VIPSWeb 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
+ * it under the terms of the NIBIO Open Source License as published by 
+ * NIBIO, either version 1 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
- * Bioforsk Open Source License for more details.
+ * NIBIO Open Source License for more details.
  * 
- * You should have received a copy of the Bioforsk Open Source License
- * along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
  * 
  */
 
@@ -21,8 +21,8 @@
  * Include this in your HTML page if you want to avoid fetching local names 
  * of the models asynchronously from VIPSLogic
  *
- * @copyright 2014 <a href="http://www.bioforsk.no/">Bioforsk</a>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2014 <a href="http://www.nibio.no/">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
  */
 {% load forecast_extras %}
 var modelLocalNames= {};
diff --git a/forecasts/templatetags/forecast_extras.py b/forecasts/templatetags/forecast_extras.py
index 959f47aaff0cdeef34cd1377e99eccde79a610ba..9846f50a63680b15dc4cebbd850f88a7d7c16196 100644
--- a/forecasts/templatetags/forecast_extras.py
+++ b/forecasts/templatetags/forecast_extras.py
@@ -1,19 +1,19 @@
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb 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
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 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
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 from django import template
 
diff --git a/forecasts/urls.py b/forecasts/urls.py
index 1032146a52279977c358dc50cbc5198bc7d2f309..69d3c90f1c58c35f10ec5a11c71211ca1c7f96c0 100644
--- a/forecasts/urls.py
+++ b/forecasts/urls.py
@@ -1,19 +1,19 @@
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb 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
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 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
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 from django.conf.urls import patterns, url
 from django.views.decorators.cache import cache_page
diff --git a/forecasts/views.py b/forecasts/views.py
index 73382c8a8c038a58d0d1c39ccd982aa5efc2343c..79dabc4c32759e9de09599603088ef52f039a678 100644
--- a/forecasts/views.py
+++ b/forecasts/views.py
@@ -1,21 +1,21 @@
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb 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
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 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
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 #
-# @author: Tor-Einar Skog <tor-einar.skog@bioforsk.no> 
+# @author: Tor-Einar Skog <tor-einar.skog@nibio.no> 
 
 
 from django.http import HttpResponse
diff --git a/information/admin.py b/information/admin.py
index a42af2dab89f2dbe5b2a143f027e7b7f6a937982..cfc9bcc8a4349926d1f54eda0e7275774924e4b4 100644
--- a/information/admin.py
+++ b/information/admin.py
@@ -1,19 +1,19 @@
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb 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
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 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
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 
 from django.contrib import admin
diff --git a/information/urls.py b/information/urls.py
index 65788392d773f8b19fb17342a71659833bc6ec4a..9a18bfc68bf6c7713915e0f56f87e0e96e673058 100644
--- a/information/urls.py
+++ b/information/urls.py
@@ -1,19 +1,19 @@
 #
-# Copyright (c) 2015 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2015 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb 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
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 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
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 
 from django.conf.urls import patterns, url
diff --git a/information/views.py b/information/views.py
index abed76e286072a2f671dea9d8ede270b1a590ac2..0870a4cab9b35bdc6a975bd9a4bf4c631cbe3d44 100644
--- a/information/views.py
+++ b/information/views.py
@@ -1,19 +1,19 @@
 #
-# Copyright (c) 2015 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2015 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb 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
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 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
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 
 from django.shortcuts import render
diff --git a/messages/admin.py b/messages/admin.py
index d9345e36765e2cddd6dfa2330da6d9d28094650f..5e7e0b1fef1dc481ee8bf9900cbc44a23394364f 100644
--- a/messages/admin.py
+++ b/messages/admin.py
@@ -1,19 +1,19 @@
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb 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
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 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
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 
 """
diff --git a/messages/locale/nb/LC_MESSAGES/django.po b/messages/locale/nb/LC_MESSAGES/django.po
index e0753d0d06d33fff8d86df70c15a7be83757a2bb..1f9b6dfc0b55c69ac7d1657a6fd39769c9bafd76 100644
--- a/messages/locale/nb/LC_MESSAGES/django.po
+++ b/messages/locale/nb/LC_MESSAGES/django.po
@@ -1,4 +1,4 @@
-#    Copyright (C) 2014 Bioforsk
+#    Copyright (C) 2014 NIBIO
 #    
 #    This file is part of VIPSWeb
 #
diff --git a/messages/models.py b/messages/models.py
index fca54dec9be9dffd2f041dc240c778e16e83cef2..1f48cae13c0eb842968d308d6cba71b498af1469 100644
--- a/messages/models.py
+++ b/messages/models.py
@@ -1,19 +1,19 @@
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb 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
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 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
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 
 import requests
diff --git a/messages/urls.py b/messages/urls.py
index b8ed55de95999b2ffe77ecee25662dbaf7cb8f21..47dacdc6e1752898ea346e88e47e70cb1e17040b 100644
--- a/messages/urls.py
+++ b/messages/urls.py
@@ -1,19 +1,19 @@
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb 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
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 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
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 
 from django.conf.urls import patterns, url
diff --git a/messages/views.py b/messages/views.py
index 2c62a73022e7022999e1e335dd3ac4d51abe0777..3e708593d5aad36d5ad864a6f2800877f46f6581 100644
--- a/messages/views.py
+++ b/messages/views.py
@@ -1,19 +1,19 @@
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb 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
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 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
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 
 from django.shortcuts import render
diff --git a/organisms/models.py b/organisms/models.py
index 4b656ecfc261aad7be497fd5c7a697f81124bd3a..1374b67caf27c877ae29f6c8f7a7a34a2844e416 100644
--- a/organisms/models.py
+++ b/organisms/models.py
@@ -1,19 +1,19 @@
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb 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
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 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
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 
 import requests
diff --git a/organisms/static/organisms/organismsUtil.js b/organisms/static/organisms/organismsUtil.js
index a64bff3a0a15f9b999144f92701985f44d7839f3..3b67ff91b1bdf4bb2642cadad74bb2bf4e9ee94a 100644
--- a/organisms/static/organisms/organismsUtil.js
+++ b/organisms/static/organisms/organismsUtil.js
@@ -20,7 +20,7 @@
 /**
  * Utility JavaScript. Used here and there. To whom it may concern... 
  *
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
  */
 
 function getOrganismLocalNameWithFallback(organism, currentLanguage, defaultLanguage)
diff --git a/organisms/urls.py b/organisms/urls.py
index 652c605fbb7af38277d373f8e2a90dd28976dc9c..454ce6235331fc7745a827aa572cdfecabdf347d 100644
--- a/organisms/urls.py
+++ b/organisms/urls.py
@@ -1,19 +1,19 @@
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb 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
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 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
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 
 from django.conf.urls import patterns, url
diff --git a/organisms/views.py b/organisms/views.py
index d7c01172cf72269aa909ee046a2f04cfe4760628..f46d30bc564eb914cb17571fe54e2d2d0d9255bf 100644
--- a/organisms/views.py
+++ b/organisms/views.py
@@ -1,19 +1,19 @@
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb 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
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 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
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 
 from django.shortcuts import render, get_object_or_404
diff --git a/requirements.txt b/requirements.txt
index 24614624bec6dabfaf8ed0e761ce5436d64cead4..d26ac3f78a907baef15f25ded39ddf58e875b679 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,19 +1,19 @@
 #
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. 
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
 # 
 # This file is part of VIPSWeb.
 # VIPSWeb 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
+# it under the terms of the NIBIO Open Source License as published by 
+# NIBIO, either version 1 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
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
 #
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb.  If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 
 # Please add requirements here