Minor changes
Merge branch 'master' of https://github.com/amaurial/mergCanBus

Conflicts:
	mergCanBus.layout