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
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