CRA-505: Manual commit before pull from upstream.
CRA-530: Pull from upstream.
CRA-503: Changed code so that reservoir variables vector now always exists for each vintage, but may be empty.
CRA-530: Implemented range and value to seismic-quality-grid. Moved makeCovGrid2D from background.cpp to kriging2d.cpp.
CRA-530: Small fixes.
CRA-530: Pull from upstream.
CRA-503 Merging branch with master.
CRA-530: Merge to master.
Merge pull request #15 from RagnarHauge/master

CRA-503: Fixed bug so that keyword reservoir is no longer needed when using rock physics.
Merge branch 'master' of git://github.com/CRAVA/crava
Merge pull request #16 from hgolsen/master

CRA-530: Implemented range and value to seismic-quality-grid.
CRA-541: Changed procedure by now merging branch into master before pulling from upstream, and then committing before pushing to origin. Also added graphical illustration of process.
Merge branch 'master' of git://github.com/CRAVA/crava
Merge pull request #17 from RagnarHauge/master

CRA-541: Update working procedure for Git/GitHub
CRA-540 Write error messages when distribution-with-trend can not be estimated from wells
Pull from upstream
Merge branch 'master' of https://github.com/CRAVA/crava

Conflicts:
	src/kriging2d.cpp