minor changes
Merge branch 'master' of github.com:scattlab/scattlab

Conflicts:
	core/joint_tf_wavelet_factory_1d.m