modified:   ProgrammerPigLibrary/whUmbracoBase/DefaultConstants/ConfigConstants.cs
	modified:   ProgrammerPigLibrary/whUmbracoBase/Managers/Emails/EmailManager.cs
	modified:   ProgrammerPigLibrary/whUmbracoBase/Managers/Members/MemberManager.cs
	modified:   ProgrammerPigLibrary/whUmbracoBase/WebServices/whUmbracoAuthenticationController.cs
	modified:   ProgrammerPigLibrary/whUmbracoBase/bin/Debug/whUmbracoBase.dll
	modified:   ProgrammerPigLibrary/whUmbracoBase/bin/Debug/whUmbracoBase.pdb
	modified:   ProgrammerPigLibrary/whUmbracoBase/obj/Debug/whUmbracoBase.csproj.FileListAbsolute.txt
	modified:   ProgrammerPigLibrary/whUmbracoBase/obj/Debug/whUmbracoBase.csprojResolveAssemblyReference.cache
	modified:   ProgrammerPigLibrary/whUmbracoBase/obj/Debug/whUmbracoBase.dll
	modified:   ProgrammerPigLibrary/whUmbracoBase/obj/Debug/whUmbracoBase.pdb
	modified:   ProgrammerPigLibrary/whUmbracoBase/whUmbracoBase.csproj
	modified:   midana/midana.v11.suo
	modified:   midana/midana/Themes2/css/style.css
	modified:   midana/midana/Themes2/js/script.js
	modified:   midana/midana/Umbraco/sublayouts/phase2/popup/ForgetPassword.ascx
	modified:   midana/midana/Web.config
	ProgrammerPigLibrary/whUmbracoBase/DefaultConstants/MemberFieldConstants.cs
	ProgrammerPigLibrary/whUmbracoBase/DefaultConstants/SettingFieldConstants.cs
	ProgrammerPigLibrary/whUmbracoBase/Managers/Members/CredentialManager.cs
check in
Merge remote-tracking branch 'origin/master'

Conflicts:
	midana/midana.v11.suo