mergin with new math functions

Conflicts:
	sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c