CRA-743 Removed more bugs
Merge branch 'master' of https://github.com/CRAVA/crava

Conflicts:
	src/commondata.cpp
CRA-748 Include reading of porosity logs
CRA-743 Minor fix
Merge branch 'master' of https://github.com/CRAVA/crava
Merge pull request #168 from hgolsen/master

CRA-749: Added writing of ascii-surfaces
Pull from upstream
Merge branch 'master' of https://github.com/CRAVA/crava

Conflicts:
	src/commondata.cpp
Merge pull request #169 from ulvmoen/master

Fix for rock physics
CRA-678: Fixed bug with BlockWellsForEstimation if there is no seismic data.
Merge branch 'master' of git://github.com/CRAVA/crava into CRA-738
CRA-751: Fixed estimation mode and background for multiple intervals, added CombineResult under WriteEstimationResults and WriteOutputSurfaces under SetupOutputSimbox.
CRA-751: Added that background must be ok before estimating correlations.