Merge remote-tracking branch 'multiwii/master'

Conflicts:
	src/board.h
	src/drv_timer.c
	src/mw.c
	src/sensors.c