Revive
Merge branch 'master' of https://github.com/mkaa00x/GestureRecognitionSoftware

Conflicts:
	nbproject/private/private.xml