name change
Merge remote-tracking branch 'origin/master'

Conflicts:
	PTS2.2/PTS2.2.v12.suo
Merge branch 'master' of https://github.com/PTS2/PTS2.2

Conflicts:
	PTS2.2/PTS2.2.v12.suo
	PTS2.2/PTS2.2/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache