New version
Merge branch 'master' of https://github.com/mattiasclaesson/Trionic

Conflicts:
	SetupCANFlash/SetupCANFlash.vdproj