#CRA-257
#CRA-257 Temp check-in
#CRA-257 Temporary commit
#CRA-257
Merge branch 'CRA-257_II' into CRA-505

Conflicts:
	main.cpp
	src/blockedlogscommon.cpp
	src/blockedlogscommon.h
	src/commondata.cpp
	src/commondata.h
	src/multiintervalgrid.h
#CRA-257 Fixed some bugs after merge
Merge pull request #82 from enesvold/CRA-505

Cra 505, Cra 257