Small bug fix for tone detection
Merge remote-tracking branch 'origin/master' into Working_Alpha

Conflicts:
	project/src/VisionSet_project.c
	project/src/musicplayer.c