compatability with DPM features
Merge branch 'master' into superres

Conflicts:
	internal/learnpairdict.m