some change
Merge remote-tracking branch 'origin/master' into Xiao

Conflicts:
	matlab/waveletDecomponent.asv
	matlab/waveletDecomponent.m