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