Merge branch 'dev' into positive_control_gains

Conflicts:
	conf/airframes/ENAC/fixed-wing/funjet2.xml
	conf/airframes/ENAC/fixed-wing/funjet2_nc.xml
	conf/airframes/ENAC/fixed-wing/funjet2_new.xml
	conf/airframes/ENAC/fixed-wing/funjet3.xml
	conf/airframes/ENAC/fixed-wing/merlin.xml
	conf/airframes/ENAC/fixed-wing/minimag1.xml
	conf/airframes/ENAC/fixed-wing/obsolete/drops.xml
	conf/airframes/ENAC/fixed-wing/overview.xml
	conf/airframes/ENAC/fixed-wing/soarzi.xml
	conf/airframes/ENAC/fixed-wing/weasel.xml
	conf/airframes/LAAS/mmlaas_N1.xml
	conf/airframes/LAAS/mmlaas_N2.xml
	conf/airframes/LAAS/mmlaas_N3.xml
	conf/airframes/Poine/funjet42.xml
	conf/airframes/Poine/swift_1.xml
	conf/airframes/TU_Delft/MicrojetBR.xml
	conf/airframes/delta_wing_minimal_example.xml
	conf/airframes/easystar_ets_example.xml
	conf/airframes/easystar_example.xml
	conf/airframes/example_twog_analogimu.xml
	conf/airframes/funjet_cam_example.xml
	conf/airframes/funjet_example.xml
	conf/airframes/mm/extra/press_t.xml
	conf/airframes/mm/extra/probe_t.xml
	conf/airframes/mm/extra/turbine_trigger.xml
	conf/airframes/mm/fixed-wing/drops.xml
	conf/airframes/mm/fixed-wing/funjet43.xml
	conf/airframes/mm/fixed-wing/funjetdca.xml
	conf/airframes/mm/fixed-wing/funjetdcb.xml
	conf/airframes/mm/fixed-wing/funjetdcc.xml
	conf/airframes/mm/fixed-wing/funjeteth1.xml
	conf/airframes/mm/fixed-wing/funjeteth2.xml
	conf/airframes/mm/fixed-wing/funjetfmi1.xml
	conf/airframes/mm/fixed-wing/funjetfmi2.xml
	conf/airframes/mm/fixed-wing/funjetfmi3.xml
	conf/airframes/mm/fixed-wing/funjetgfi1.xml
	conf/airframes/mm/fixed-wing/funjetgfi3.xml
	conf/airframes/mm/fixed-wing/funjetgfi4.xml
	conf/airframes/mm/fixed-wing/funjetgfi5.xml
	conf/airframes/mm/fixed-wing/funjetgfi6.xml
	conf/airframes/mm/fixed-wing/funjetgfi7.xml
	conf/airframes/mm/fixed-wing/funjetgfi8.xml
	conf/airframes/mm/fixed-wing/funjetgfi9.xml
	conf/airframes/mm/fixed-wing/funjetlisa.xml
	conf/airframes/mm/fixed-wing/funjetlisam.xml
	conf/airframes/mm/fixed-wing/funjetmm.xml
	conf/airframes/mm/fixed-wing/funjetmm2.xml
	conf/airframes/mm/fixed-wing/fw_ins_arduimu.xml
	conf/airframes/mm/fixed-wing/merlin.xml
	conf/airframes/mm/fixed-wing/miniwing.xml
	conf/airframes/mm/fixed-wing/slowfast.xml
	conf/airframes/mm/fixed-wing/slowfast2.xml
	conf/airframes/mm/fixed-wing/twinstarmm.xml
	conf/airframes/mm/hangar/black_one.xml
	conf/airframes/mm/hangar/glass_one1.xml
	conf/airframes/mm/hangar/glass_one2.xml
	conf/airframes/mm/hangar/glass_one3.xml
	conf/airframes/mm/hangar/lila.xml
	conf/airframes/mm/hangar/mac06a.xml
	conf/airframes/mm/hangar/red_one.xml
	conf/airframes/obsolete/easystar2.xml
	conf/airframes/obsolete/kalscott_easystar.xml
	conf/airframes/obsolete/microjet5_tp_auto.xml
	conf/airframes/obsolete/microjet6.xml
	conf/airframes/obsolete/microjetII.xml
	conf/airframes/obsolete/minimag1.xml
	conf/airframes/obsolete/minimag_fs.xml
	conf/airframes/obsolete/mmlaas_N1_carto_cam.xml
	conf/airframes/obsolete/storm1.xml
	conf/airframes/obsolete/tiny2.xml
	conf/airframes/obsolete/xxx1.xml
	conf/airframes/test_hb.xml
	conf/airframes/twinstar_example.xml
	conf/airframes/usb_test.xml
	conf/settings/tuning_ctl_adaptive.xml
	sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c

conf/airframes/ENAC/fixed-wing/funjet2.xml

@@ -171,9 +171,9 @@
 
   <section name="HORIZONTAL CONTROL" prefix="H_CTL_">
     <define name="COURSE_PGAIN" value="1."/>
-    <define name="ROLL_MAX_SETPOINT" value="0.8" unit="radians"/>
-    <define name="PITCH_MAX_SETPOINT" value="0.5" unit="radians"/>
-    <define name="PITCH_MIN_SETPOINT" value="-0.5" unit="radians"/>
+    <define name="ROLL_MAX_SETPOINT" value="0.8" unit="rad"/>
+    <define name="PITCH_MAX_SETPOINT" value="0.5" unit="rad"/>
+    <define name="PITCH_MIN_SETPOINT" value="-0.5" unit="rad"/>
 
     <define name="ROLL_ATTITUDE_GAIN" value="9000."/>
     <define name="ROLL_RATE_GAIN" value="3000."/>