uiuuc classif
Merge branch 'master' of github.com:scattlab/scattlab

Conflicts:
	core/scat.m