...
Merge branch 'master' of https://github.com/SimuJenni/3DDPM

Conflicts:
	test/data/car_8_test.mat
modified code to allow use of old features...