CRA-708: Fixed error in text in main, order of variables in constructors in wavelet.
Merge branch 'CRA-505' of git://github.com/CRAVA/crava into CRA-708

Conflicts:
	main.cpp
CRA-708 Handling of seismic data in FFTGrid. Not correct yet, checking in for update form main branch.
Merge branch 'CRA-505' of git://github.com/CRAVA/crava into CRA-708
CRA-708: Fixed bug in string handling when writing simbox zone.
CRA-708: Fixed handling of FFTFileGrids
Merge pull request #125 from RagnarHauge/CRA-505

Cra 505 Cra-708 mostly fixed, case 1 now runs ok on linux test suite.