update

update
Merge remote-tracking branch 'origin/master'

Conflicts:
	KWManager/KWManager.v12.suo
	KWManager/KWManager/bin/Debug/KWManager.exe
	KWManager/KWManager/bin/Debug/KWManager.pdb
	KWManager/KWManager/obj/Debug/KWManager.exe
	KWManager/KWManager/obj/Debug/KWManager.pdb