Change the CMD_ID of the arm/disarm and change mode
Merge branch 'SwarmControl' of http://github.com/ndousse/qgroundcontrol into SwarmControl

Conflicts:
	src/ui/mission/QGCSwarmControl.cpp