Merge branch 'dev' of https://github.com/A00841554/GrapefruitProtocol into joel

Conflicts:
	controlthread.h
Merge branch 'joel' of https://github.com/A00841554/GrapefruitProtocol into joel

Conflicts:
	controlthread.h
changed char to unsigned char