edit
Merge remote-tracking branch 'origin/master'

Conflicts:
	Login/Login.aspx.cs
	vwd.webinfo