Merge branch 'master' of https://github.com/carlosfm1989/Tricopter

Conflicts:
	Tri-copter/.settings/language.settings.xml
	Tri-copter/L5_Application/main.cpp
	Tri-copter/_build/L0_LowLevel/source/subdir.mk
	Tri-copter/_build/L1_FreeRTOS/MemMang/subdir.mk
	Tri-copter/_build/L1_FreeRTOS/hooks/subdir.mk
	Tri-copter/_build/L1_FreeRTOS/portable/subdir.mk
	Tri-copter/_build/L1_FreeRTOS/src/subdir.mk
	Tri-copter/_build/L2_Drivers/base/subdir.mk
	Tri-copter/_build/L2_Drivers/src/subdir.mk
	Tri-copter/_build/L3_Utils/src/subdir.mk
	Tri-copter/_build/L3_Utils/tlm/src/subdir.mk
	Tri-copter/_build/L4_IO/fat/disk/subdir.mk
	Tri-copter/_build/L4_IO/fat/option/subdir.mk
	Tri-copter/_build/L4_IO/fat/subdir.mk
	Tri-copter/_build/L4_IO/src/subdir.mk
	Tri-copter/_build/L4_IO/wireless/src/subdir.mk
	Tri-copter/_build/L5_Application/examples/subdir.mk
	Tri-copter/_build/L5_Application/source/cmd_handlers/handlers.d
	Tri-copter/_build/L5_Application/source/cmd_handlers/prog_handlers.d
	Tri-copter/_build/L5_Application/source/cmd_handlers/subdir.mk

	Tri-copter/_build/L5_Application/source/cmd_handlers/wireless_handlers.d
	Tri-copter/_build/L5_Application/source/subdir.mk
	Tri-copter/_build/L5_Application/subdir.mk
	Tri-copter/_build/newlib/malloc_lock.d
	Tri-copter/_build/newlib/memory.d
	Tri-copter/_build/newlib/newlib_syscalls.d
	Tri-copter/_build/newlib/newlib_time.d
	Tri-copter/_build/newlib/printf_lib.d
	Tri-copter/_build/newlib/subdir.mk