4
Merge remote-tracking branch 'origin/master'

Conflicts:
	NvtlApiWrapper.sdf
	NvtlApiWrapper.v12.suo

	NvtlApiWrapper/Release/.NETFramework,Version=v4.5.AssemblyAttributes.obj
	NvtlApiWrapper/Release/AssemblyInfo.obj
	NvtlApiWrapper/Release/NvtlApiWrapper.log
	NvtlApiWrapper/Release/NvtlApiWrapper.pch
	NvtlApiWrapper/Release/SdkWrapper.obj
	NvtlApiWrapper/Release/SdkWrapperManaged.obj
	NvtlApiWrapper/Release/Stdafx.obj
	NvtlApiWrapper/Release/vc120.pdb
	NvtlApiWrapper/SdkWrapperManaged.cpp
	Release/NvtlApiWrapper.dll
	Release/NvtlApiWrapper.pdb
	ipch/nvtlapiwrapper-bf394df0/nvtlapiwrapper-b5a33f25.ipch