CRA-694
#CRA-696
#CRA-553, #CRA-699, #CRA-696
Merge branch 'CRA-505' of https://github.com/CRAVA/crava into CRA-505
Merge branch 'CRA-505' of https://github.com/CRAVA/crava into CRA-505

Conflicts:
	src/blockedlogscommon.cpp
	src/commondata.cpp
	src/commondata.h
	src/multiintervalgrid.cpp
	src/xmlmodelfile.cpp
#CRA-699, #CRA-553 merge with hgolsen's pull request 110
Merge pull request #111 from enesvold/CRA-505

Cra 505