random stuff
Merge branch 'master' of https://github.com/mlefebvre/OpenHGR

Conflicts:
	Recognition/Recognition.layout