1
Merge branch 'JX_AirShow' of https://github.com/zhao0079/Simulink_for_Quadcopter into JX_AirShow

Conflicts:
	MAVLink Simulink block/Joystick20131221_test.slx
	MAVLink Simulink block/Joystick20131221_test_sfun.mexw64
Merge branch 'JX_AirShow' of https://github.com/zhao0079/Simulink_for_Quadcopter into JX_AirShow
Merge branch 'JX_AirShow' of https://github.com/zhao0079/Simulink_for_Quadcopter into JX_AirShow
resolved safety bug.