Merge branch 'Dev_DISCOVERY'

Conflicts:
	STM32F3-Discovery/Fiscopter/MDK-ARM/Fiscopter.uvopt