Login page
login
Merge remote-tracking branch 'origin/master'

Conflicts:
	Portal/Portal/GCCHRPortalApplication.v12.suo

	Portal/Portal/learnhtmlcss/obj/Debug/PresentationLayer.vbproj.FileListAbsolute.txt

	Portal/Portal/learnhtmlcss/obj/Debug/PresentationLayer.vbprojResolveAssemblyReference.cache
Merge remote-tracking branch 'origin/master'

Conflicts:
	Portal/Portal/GCCHRPortalApplication.v12.suo

	Portal/Portal/learnhtmlcss/obj/Debug/PresentationLayer.vbproj.FileListAbsolute.txt

	Portal/Portal/learnhtmlcss/obj/Debug/PresentationLayer.vbprojResolveAssemblyReference.cache