fffff
Merge remote-tracking branch 'origin/master'

Conflicts:
	TuristAppVersion3.v12.suo

	TuristAppVersion3/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache