Merge pull request #37 from hgolsen/CRA-505

Cra 505, CRA 568
Merge pull request #39 from hgolsen/CRA-505

Cra 505
Merge pull request #41 from hgolsen/CRA-505

Cra 505
Merge pull request #50 from hgolsen/CRA-505

Cra 505
#CRA-571 New log blocking routine for estimation of correlations
#CRA-505 Merged changes from HGOlsen
Merge branch 'CRA-505' of https://github.com/CRAVA/crava into CRA-505

Conflicts:
	main.cpp
	src/commondata.cpp
	src/multiintervalgrid.h
#CRA-257 Temporary check-in
Merge pull request #64 from hgolsen/CRA-505

Cra 505
#CRA-257 Commit before testing
Merge pull request #69 from hgolsen/CRA-505

Cra 505
#CRA-553 Moved estimation of XY-correlation to the CommonData class, some bugfixes
Merge branch 'CRA-505' of https://github.com/CRAVA/crava into CRA-505

Conflicts:
	src/blockedlogscommon.cpp
	src/blockedlogscommon.h
	src/commondata.cpp
	src/multiintervalgrid.cpp
	src/multiintervalgrid.h
#CRA-553 Fixes related to merge
Merge branch 'CRA-257' into CRA-505

Conflicts:
	libs/nrlib/grid/grid.hpp
	libs/nrlib/well/rmswell.cpp
	libs/nrlib/well/well.cpp
	main.cpp
	src/background.h
	src/blockedlogscommon.cpp
	src/blockedlogscommon.h
	src/commondata.cpp
	src/commondata.h
	src/modelavodynamic.cpp
	src/modelavostatic.cpp
	src/modelgeneral.cpp
	src/modelgravitystatic.cpp
	src/multiintervalgrid.cpp
	src/multiintervalgrid.h
	src/seismicstorage.cpp
	src/wavelet1D.cpp
	src/wavelet3D.cpp
#CRA-553 Bugfixes after merge
Merge pull request #70 from enesvold/CRA-505

Cra 505
CRA-505: Merged with enesvold 1812.