fixes to training
Merge branch 'master' of https://github.com/MagnusStenman/facerecognition

Conflicts:
	FaceRecognition/src/Training.java