Merge remote-tracking branch 'origin/master'

Conflicts:
	FileIODemo/bin/Debug/FileIODemo.exe
	FileIODemo/bin/Debug/FileIODemo.pdb
	FileIODemo/obj/Debug/FileIODemo.exe
	FileIODemo/obj/Debug/FileIODemo.pdb
	WebTest/Controllers/AccountController.cs
	WebTest/Views/Account/Login.cshtml
	WebTest/WebTest.csproj