10/12
Merge remote-tracking branch 'origin/master'

Conflicts:
	ASproject.v11.suo
	ASproject/bin/x64/Debug/ASproject.exe
	ASproject/bin/x64/Debug/ASproject.pdb
	ASproject/obj/x64/Debug/ASproject.csproj.FileListAbsolute.txt
	ASproject/obj/x64/Debug/ASproject.exe
	ASproject/obj/x64/Debug/ASproject.pdb
	ASproject/obj/x64/Debug/DesignTimeResolveAssemblyReferences.cache