Upgraded .vcxproj file to VS2013
Fixed warning on Visual Studio 2013.
Merge branch 'master' into tun