.

small changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	KWManager/KWManager/obj/Debug/KWManager.csproj.FileListAbsolute.txt