Updates after merge, line-endings fixed for uart.c
Merge branch 'master'

Conflicts:
	interface/interface/hal/TARGET_Atmel/TARGET_ATSAM3U2C/uart.c
uart conflict resolved