Merge origin/master

Conflicts:
	SGArduVecMem/main.cpp
Merge origin/master

Conflicts:
	SGArduVecMem/nbproject/Makefile-Debug_PC_UNIX.mk
Merge origin/master

Conflicts:
	SGArduVecMem/nbproject/Makefile-Debug_PC_UNIX.mk