Checkpoint: Quad is flying after PID lib changes
Merge remote-tracking branch 'upstream/att_fix' into pid_fixes
Checkpoint: Quad is flying after PID lib changes

Conflicts:
	src/modules/multirotor_att_control/multirotor_attitude_control.c
First try to prevent motors from stopping when armed
sdlog2 bugs fixed
Merge pull request #311 from DrTon/sdlog2

sdlog2 bugs fixed
Adressed performance concern and fixed a copy paste bug
Merge remote-tracking branch 'upstream/master' into new_state_machine
Add PX4IOAR PX4FLOW example startup script
Merge remote-tracking branch 'upstream/io_fixes' into new_state_machine

Conflicts:
	src/drivers/px4io/px4io.cpp
	src/modules/commander/commander.c
	src/modules/commander/state_machine_helper.c
	src/modules/commander/state_machine_helper.h
	src/modules/px4iofirmware/mixer.cpp
	src/modules/uORB/topics/actuator_controls.h
	src/modules/uORB/topics/vehicle_status.h
Merge pull request #312 from samized/flowboard_master

Add PX4IOAR PX4FLOW example startup script
Changed to yaw only mag correction.
Merge branch 'master' into seatbelt_multirotor
Forgot to remove some debug stuff
Use rollacc and pitchacc from the estimator instead of differentiating in the controller
Cherry-picked commit e2ff60b0a6dbcd714d57e781d9fe174b110a6237: use rateacc values
Merge remote-tracking branch 'upstream/master' into new_state_machine
position_estimator_inav: better handling of lost GPS, minor fixes
Merge remote-tracking branch 'upstream/master' into pid_fixes

Conflicts:
	src/modules/sdlog2/sdlog2.c
Fixed numeration that was introduced through merge, I should add new log messages to the end