Merge pull request #113 from enesvold/CRA-505

Cra 701
CRA-680: Fixed resampling of wavelet from file.
Resolved conflicts after merging CRA-680
CRA-703: Errors in computing of syntehtic seismic lead to this.
Merge pull request #115 from RagnarHauge/CRA-505

Cra 505 Fixed CRA-703
#CRA-700 Some bug fixes for crashes in test cases 1 and 3
Merge branch 'CRA-505' of https://github.com/CRAVA/crava into CRA-505