fix bug in cmake file
Merge remote-tracking branch 'origin/master'

Conflicts:
	supporting_code/CMakeLists.txt
added featuresToImages.  fixed some type problems in imagesToFeatures (now uses ArrayVector)