Merge remote-tracking branch 'origin/master'

Conflicts:
	CPP/Test/Test.sdf
	CPP/Test/Test.v11.suo
	CPP/Test/test.cpp
	CPP/helper1.h
	CPP/helperbase.h
	CPP/spdchol.h
.