Square/rectangle SVM train method
Merge branch 'master' into svmtest

Conflicts:
	src/main.cpp
	src/svm_utils.h