various changes: removed dummy files between registration->xml_merge; spotted problem in timepoint number for registration; refactored padding