Working with bootloader code
Merge branch 'master' of https://github.com/grodansparadis/vscp_software

Conflicts:
	src/vscp/vscpworks/vscpworks.pjd
	src/vscp/vscpworks/vscpworks.pjd.bak