Upgraded .vcxproj file to VS2013
Merge branch 'master' into tun

Conflicts:
	libasiotap.vcxproj