some fixes
Merge branch 'master' of https://github.com/marcoag/pointcloudCSTable

Conflicts:
	rectprismCloudParticle.cpp~
	rectprismCloudParticle.h~
	rectprismFitting.h~
	shapes/rectprism.h
remove junk