SPM Vocabulary added and minor changes

Commit done from Lifelogging-PC1 Linux
Merge branch 'master' of https://github.com/MarcBS/Object_Discovery

Conflicts:
	Objects Recognition/ObjVSNoObj
SVM/Tests/testResult_PASCAL_12.txt
	Objects Recognition/ObjVSNoObj SVM/doTrain.m
	Objects Recognition/ObjVSNoObj SVM/trainObjVSNoObj.m
	Objects Recognition/SpatialPyramidMatching/getVocabularySPM.m
	loadParameters.m
Merging changes
Test Battery & Minor Bug Fixes
.Mat structures changes.
Minor changes