Merge origin/master

Conflicts:
	SGArduVecMem/nbproject/Makefile-Debug_PC_UNIX.mk