small adaptations in scripts
overview maps in 2dx_merge now are correctly displayed without resolution limit in z
preparation for nz
Revert 603474a..bccc241

This rolls back to commit 603474a4687593de84d0df8c9db2baa3a23d5707.
Revert c7d46dd..6b3874a

This rolls back to commit c7d46dd9191b7c85e21839f19176abad1ac58d5b.
Added "resetImage(true)"
Revert bccc241..49d6094

This rolls back to commit bccc2411fb2a77a7907af0500f35324403296c5e.
added resetImage(true) again
various small things
fixed crahsing preview
Qval vs Defocus added
masking in 2dx_peaksearch adapted
masking in 2dx_peaksearch adapted
minor chages
Merge branch 'master' into second_lattice_proc