Fixing login work in progress
Merge branch 'master' of https://github.com/TrifectaTech/KarzPlus

Conflicts:
	KarzPlus/Login.aspx
	KarzPlus/Login.aspx.designer.cs
	KarzPlus/Register.aspx
	KarzPlus/Site.Master