zhushi
Merge branch 'master' of https://github.com/JackSnowolf/MUEIMS

Conflicts:
	EnterpriseSystemASPX/Content/CSS/Account.css
	EnterpriseSystemASPX/Controllers/AccountController.cs
	EnterpriseSystemASPX/Views/Account/Login.aspx
	EnterpriseSystemASPXBg/bin/EnterpriseSystemASPXBg.dll
	EnterpriseSystemASPXBg/bin/EnterpriseSystemASPXBg.pdb
	EnterpriseSystemASPXBg/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	EnterpriseSystemASPXBg/obj/Debug/EnterpriseSystemASPXBg.csproj.FileListAbsolute.txt
	EnterpriseSystemASPXBg/obj/Debug/EnterpriseSystemASPXBg.csprojResolveAssemblyReference.cache
	EnterpriseSystemASPXBg/obj/Debug/EnterpriseSystemASPXBg.dll
	EnterpriseSystemASPXBg/obj/Debug/EnterpriseSystemASPXBg.pdb
jie jeu chongtu