Cleaning up
Merge branch 'master' of https://github.com/grodansparadis/vscp_software

Conflicts:
	src/vscp/uvscpd/uvscpd