Merge pull request #6 from hgolsen/CRA-505

Cra 505
CRA-539: Updated setupReflectionMatrixAndTempWavelet.
CRA-539: Updated setupReflectionMatrixAndTempWavelet
CRA-546: Started on wavelet handling
CRA-505: Merge with Erik.
Merge branch 'CRA-505' of git://github.com/CRAVA/crava into CRA-505
Merge pull request #24 from hgolsen/CRA-505

CRA 505
CRA-548
Merge branch 'CRA-505' of https://github.com/CRAVA/crava into CRA-505
CRA-548
CRA-549 Bug fix
CRA-548 Commit before merge with new updates on upstream branch
CRA-553 From Håvard Olsen
CRA-548 Temporary commit
#CRA-548 Finished
#CRA-553 Temporary commit
#CRA-557 New IntervalSimbox class and MultiIntervalGrid
#CRA-559
#CRA-560 Temporary check-in
#CRA-553