Google Integration page
Merge branch 'master' of https://github.com/micajah/Common

Conflicts:
	azure.micajah.common/ServiceConfiguration.Cloud.cscfg
	azure.micajah.common/ServiceConfiguration.Local.cscfg
	azure.micajah.common/ServiceDefinition.csdef
	lib.micajah.common/Bll/Providers/GoogleProvider.cs
	lib.micajah.common/Bll/Providers/OrganizationProvider.cs
	lib.micajah.common/Bll/Providers/ResourceProvider.cs
	lib.micajah.common/Bll/Providers/SettingProvider.cs
	lib.micajah.common/Bll/Support.cs
	lib.micajah.common/Configuration/GoogleIntegrationElement.cs
	lib.micajah.common/Configuration/WebApplicationElement.cs
	lib.micajah.common/GlobalSuppressions.cs
	lib.micajah.common/Pages/MasterPage.cs
	lib.micajah.common/Properties/Resources.Designer.cs
	lib.micajah.common/Properties/Resources.resx
	lib.micajah.common/Resources.Micajah.Common/Controls/Security/SignupOrg.ascx
	lib.micajah.common/WebControls/AdminControls/StartControl.cs
	lib.micajah.common/WebControls/Header.cs
	lib.micajah.common/WebControls/SecurityControls/ActiveInstanceControl.cs
	lib.micajah.common/WebControls/SecurityControls/ActiveOrganizationControl.cs
	lib.micajah.common/WebControls/SecurityControls/LogOffControl.cs
	lib.micajah.common/WebControls/SecurityControls/LogOnControl.cs
	lib.micajah.common/WebControls/SecurityControls/PasswordRecoveryControl.cs
	lib.micajah.common/WebControls/SecurityControls/ResetPasswordControl.cs
	lib.micajah.common/WebControls/SecurityControls/SignupOrganizationControl.cs
	lib.micajah.common/WebControls/SecurityControls/SignupUserControl.cs
	lib.micajah.common/WebControls/SecurityControls/SupportControl.cs
	lib.micajah.common/WebControls/Submenu.cs
	lib.micajah.common/lib.micajah.common.csproj
	web.micajah.common/Micajah.Common.config
	web.micajah.common/Web.config
	web.micajah.common/web.micajah.common.csproj
Merge branch 'master' of https://github.com/micajah/Common
Changes on Google Integration page
Merge branch 'master' of https://github.com/micajah/Common

Conflicts:
	lib.micajah.common/WebControls/SetupControls/BaseControl.cs
Merge branch 'master' of https://github.com/micajah/Common

Conflicts:
	lib.micajah.common/Resources.Micajah.Common/Controls/Admin/CustomUrls.ascx
	lib.micajah.common/WebControls/DetailMenu.cs