EMSCookie
admin login
Merge branch 'master' of https://github.com/JackSnowolf/MUEIMS

Conflicts:
	EnterpriseSystemASPXBg/bin/EnterpriseSystemASPXBg.dll
	EnterpriseSystemASPXBg/bin/EnterpriseSystemASPXBg.pdb
	EnterpriseSystemASPXBg/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	EnterpriseSystemASPXBg/obj/Debug/EnterpriseSystemASPXBg.csprojResolveAssemblyReference.cache
	EnterpriseSystemASPXBg/obj/Debug/EnterpriseSystemASPXBg.dll
	EnterpriseSystemASPXBg/obj/Debug/EnterpriseSystemASPXBg.pdb