commit
Merge branch 'master' of https://github.com/lezhumain/GSBCS

Conflicts:
	PPE3.v11.suo
	WpfApplication/View/LoginControl.xaml
	WpfApplication/bin/Debug/WpfApplication.exe
	WpfApplication/bin/Debug/WpfApplication.pdb
	WpfApplication/obj/Debug/View/LoginControl.baml
	WpfApplication/obj/Debug/View/LoginControl.g.cs
	WpfApplication/obj/Debug/WpfApplication.exe
	WpfApplication/obj/Debug/WpfApplication.g.resources
	WpfApplication/obj/Debug/WpfApplication.pdb
	WpfApplication/obj/Debug/WpfApplication_MarkupCompile.cache
	WpfApplication/obj/Debug/WpfApplication_MarkupCompile.i.cache