Input arming settings
Merge remote-tracking branch 'origin/master'

Conflicts:
	KFlyConfig/Communication/Protocol/KFlyCommand.cs