Merged with dem-dev

diff --cc arch/arm/arm_cm3/drivers/Mcu.c
Simple merge

diff --cc arch/ppc/mpc55xx/drivers/Can.c
Simple merge

diff --cc arch/ppc/mpc55xx/drivers/Fls.c
Simple merge

diff --cc arch/ppc/mpc55xx/drivers/Mcu.c
Simple merge

diff --cc boards/board_common.mk
Simple merge

diff --cc communication/PduR/PduR.c
Simple merge

diff --cc include/Can.h
Simple merge

diff --cc peripherals/Fls_SST25xx.c
Simple merge

diff --cc system/EcuM/EcuM_Callout_template.c
Simple merge