Merge remote-tracking branch 'upstream/obcfailsafe' into swissfang

Conflicts:
	src/lib/external_lgpl/tecs/tecs.cpp
	src/modules/commander/commander_params.c
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
	src/modules/navigator/navigator_main.cpp
This commit is contained in:
Thomas Gubler
2014-09-30 15:38:27 +02:00
30 changed files with 1595 additions and 338 deletions