Ok
Revert "-"

This reverts commit 67841345f0d3ee084e5845b4572803b03d98cddf.
Project
Merge remote-tracking branch 'origin/master'

Conflicts:
	CALVRI/CALVRI.v12.suo
	CALVRI/CALVRI/Web.config
	CALVRI/CALVRI/bin/CALVRI.dll
	CALVRI/CALVRI/bin/CALVRI.pdb
	CALVRI/CALVRI/obj/Debug/CALVRI.csproj.FileListAbsolute.txt
	CALVRI/CALVRI/obj/Debug/CALVRI.csprojResolveAssemblyReference.cache
	CALVRI/CALVRI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	CALVRI/CALVRI/obj/Release/CALVRI.csproj.FileListAbsolute.txt
	CALVRI/CALVRI/obj/Release/CALVRI.dll
	CALVRI/CALVRI/obj/Release/CALVRI.pdb

	CALVRI/CALVRI/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
Conflict resolve