Merge pull request #1536 from OPM/dev. Release 2017.05

Merge dev into master for release 2017.05

.gitignore

@@ -57,11 +57,11 @@ CTest*.cmake
 *.opensdf
 *.unsuccessfulbuild
 ipch/
-[Oo]bj/
-[Bb]in
-[Dd]ebug*/
-[Rr]elease*/
 Ankh.NoLoad
 
 #Temp files
 *.temp
+/Resinsight_Host.includes
+/Resinsight_Host.files
+/Resinsight_Host.creator
+/Resinsight_Host.config

ApplicationCode/Adm/LicenseInformation.txt

@@ -322,3 +322,46 @@ exceptions:
 CRAVA is a software package for seismic inversion and conditioning of
   geological reservoir models. CRAVA is copyrighted by the Norwegian
   Computing Center and Statoil and licensed under GPLv3+. 
+
+===============================================================================
+ Notice for opm-flowdiagnostics and opm-flowdiagnostics-applications libraries
+===============================================================================
+
+  Copyright 2016, 2017 Statoil ASA.
+
+  This file is part of the Open Porous Media Project (OPM).
+
+  OPM is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  OPM 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 General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+
+===============================================================================
+ Notice for the NightCharts code
+===============================================================================
+
+  NightCharts
+  Copyright (C) 2010 by Alexander A. Avdonin, Artem N. Ivanov / ITGears Co.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library 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
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+  Please contact [email protected] with any questions on this license.