Toolbox Update
Merge branch 'master' of https://github.com/NPTricky/img-classification-ss13

Conflicts:
	samael/samael.vcxproj
	samael/samael.vcxproj.filters
	samael/src/SamaelMainWindow.cpp