CRA-735: Added smoothing of multizone realisations, implemented as uncertain zone border. During this, found and fixed a bug in the resampling, hence many test suite updates. (Small impact, but it was a bug.)
Merge pull request #174 from hgolsen/master

CRA-505: bug fix and logging
CRA-735
Merge branch 'master' of git://github.com/CRAVA/crava

Conflicts:
	src/cravaresult.cpp
Merge pull request #176 from RagnarHauge/master

CRA-735: Added smoothing of multizone realisations
CRA-505, CRA-660: Added default corrDirTopBaseConform to intervals. Fixed bug in FindXYZForVirtualPart.
Merge branch 'master' of git://github.com/CRAVA/crava into CRA-752
CRA-505, CRA-735: Added logging that grids are written. Added static casts.
CRA-754:
In commondata constructor: Made it possible to bypass background model generation in estimation mode.

CommonData::CheckThatDataCoverGrid: Fixed output of angle to degrees.

In CommonData::CheckThatDataCoverGrid: fixed offset handling, as this is for seismic grids, and thus shifted 0.5 grid cell.
Merge branch 'CRA-754'
Merge pull request #177 from RagnarHauge/master

CRA-754: Some small fixes
CRA-538: Removed unused constructor in BlockedLogsCommon, based on blockedlogsforzone.
CRA-752, CRA-756: Allowed use of only top-conform or base-conform under correlation-direction. Added RemoveNaNFromSurface in MultiIntervalGrid to set undefined values in input surfaces as missing. Removed checking of thickness (maximum-relative-thickness-difference) for eroded surfacesFixed bug in setup of simbox with correlation-direction. Fixed bug with setup simbox with correlation direction.
CRA-755: Added an is_inside variable when blocking wells to simboxes, allowing some wells to be outside some interval simboxes.
CRA-757: Added use of NRLib grid in CombineResult.
CRA-752, CRA-757: Fixed bug with reading top-conform from model file.
Merge branch 'master' of git://github.com/CRAVA/crava into CRA-752
CRA-752: Added an error if eroded surfaces have maximum thickness equal to zero.
CRA-505: Logging.
Commit manual.
CRA-505: Pull from upstream.