123
Merge remote-tracking branch 'origin/master'

Conflicts:
	STM32Project/Project.dep
	STM32Project/settings/STM32Workspace.wsdt