-
Merge remote-tracking branch 'origin/master'

Conflicts:
	CALVRI/CALVRI.v12.suo
	CALVRI/CALVRI/bin/CALVRI.dll
	CALVRI/CALVRI/bin/CALVRI.pdb
	CALVRI/CALVRI/obj/Debug/CALVRI.dll
	CALVRI/CALVRI/obj/Debug/CALVRI.pdb