Merge pull request #96 from enesvold/CRA-505

Cra 505
CRA-675: Fixed handling of wavelets when given from file. Have now made use of estimation simbox and full inversion simbox consistent, and cleaned up wavelet handling in general.
Merge branch 'CRA-675' into CRA-505

Conflicts:
	src/commondata.cpp
	src/commondata.h
	src/modelavodynamic.cpp
	src/modelavostatic.cpp
	src/modelavostatic.h
	src/wavelet1D.cpp
Merge pull request #97 from RagnarHauge/CRA-505

Cra 505
CRA-257 Temporary check-in; estimated correlations are hard coded with the example from the user manual for now
Merge branch 'CRA-257' into CRA-505

Conflicts:
	src/commondata.cpp
	src/commondata.h