Merge origin/master

Conflicts:
	SGArduCmn/nbproject/private/private.xml
	SGArduModbus/nbproject/private/private.xml
	SGArduVecMem/nbproject/private/private.xml