Merge branch 'master' into python_svm_training
#637: svm_training.py, add 'xml_to_json' method call
#637: svm_training.py, remove comments
Merge pull request #638 from jeff1evesque/python_svm_training

#637: Call 'xml_to_json' method in 'svm_training.py'