Merge remote-tracking branch 'origin/master'

Conflicts:
	Source Code/Arduino/Devices/HP/HP/HP.ino

More work on the HP code