Update.
Merge remote-tracking branch 'origin/master'

Conflicts:
	ProjectTemplate.v12.suo
	ProjectTemplate/bin/ProjectTemplate.dll
	ProjectTemplate/bin/ProjectTemplate.pdb
	ProjectTemplate/obj/Debug/ProjectTemplate.csproj.FileListAbsolute.txt

	ProjectTemplate/obj/Debug/ProjectTemplate.csprojResolveAssemblyReference.cache
	ProjectTemplate/obj/Debug/ProjectTemplate.dll
	ProjectTemplate/obj/Debug/ProjectTemplate.pdb