make concatenate_freq take fr_j into account (if available) & fix bug when layer is empty
move map_meta out
make wavelet_layer_1d copy all meta
add joint_tf_wavelet_layer_1d
Merge branch 'master' of github.com:scattlab/scattlab