New Updates

New Updates
Merge branch 'master' of https://github.com/socioboard/socioboard

Conflicts:
	SocioBoard/Agency.aspx
	SocioBoard/AjaxHome.aspx.cs
	SocioBoard/Contents/css/Style_previous.css
	SocioBoard/Contents/css/socialsuite.css
	SocioBoard/Enterprise.aspx
	SocioBoard/Enterprise.aspx.cs
	SocioBoard/Enterprise.aspx.designer.cs
	SocioBoard/Helper/AjaxInviteFrndsByCloudSponge.aspx.cs
	SocioBoard/Helper/Ajaxfacetwt.aspx.cs
	SocioBoard/Home.aspx.cs
	SocioBoard/Library/GlobusMailLib/MailHelper.cs
	SocioBoard/Library/GlobusMailLib/bin/Debug/GlobusMailLib.dll
	SocioBoard/Library/GlobusMailLib/bin/Debug/GlobusMailLib.pdb

	SocioBoard/Library/GlobusMailLib/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	SocioBoard/Library/GlobusMailLib/obj/Debug/GlobusMailLib.csproj.FileListAbsolute.txt
	SocioBoard/Library/GlobusMailLib/obj/Debug/GlobusMailLib.dll
	SocioBoard/Library/GlobusMailLib/obj/Debug/GlobusMailLib.pdb
	SocioBoard/MasterPage/Site.Master
	SocioBoard/MasterPage/socialsuite.Master
	SocioBoard/Referrals.aspx
	SocioBoard/Referrals.aspx.cs
	SocioBoard/Registration.aspx.cs
	SocioBoard/Settings/Billing.aspx.cs
	SocioBoard/SocialBoard.suo
	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/Admin.hbm.xml
	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/Ads.hbm.xml

	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/ArchiveMessage.hbm.xml

	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/Blog_Comments.hbm.xml
	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/Blog_Posts.hbm.xml

	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/DiscoverySearch.hbm.xml
	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/Drafts.hbm.xml

	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/FacebookAccount.hbm.xml

	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/FacebookFeed.hbm.xml

	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/FacebookInsightPostStats.hbm.xml

	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/FacebookInsightStats.hbm.xml

	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/FacebookMessage.hbm.xml

	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/FacebookStats.hbm.xml

	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/GoogleAnalyticsAccount.hbm.xml

	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/GooglePlusAccount.hbm.xml

	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/GooglePlusActivities.hbm.xml

	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/GroupProfile.hbm.xml
	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/Groups.hbm.xml

	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/InstagramAccount.hbm.xml

	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/InstagramComment.hbm.xml

	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/InstagramFeed.hbm.xml

	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/LinkedInAccount.hbm.xml

	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/LinkedInFeed.hbm.xml

	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/LinkedinMessage.hbm.xml
	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/Log.hbm.xml
	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/News.hbm.xml
	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/NewsLetter.hbm.xml
	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/Package.hbm.xml

	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/PaymentTransaction.hbm.xml
	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/RssFeeds.hbm.xml
	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/RssReader.hbm.xml

	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/ScheduledMessage.hbm.xml

	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/SocialProfile.hbm.xml
	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/TaskComment.hbm.xml
	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/Tasks.hbm.xml
	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/Team.hbm.xml

	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/TeamMemberProfile.hbm.xml

	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/TwitterAccount.hbm.xml

	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/TwitterDirectMessages.hbm.xml
	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/TwitterFeed.hbm.xml

	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/TwitterMessage.hbm.xml

	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/TwitterStats.hbm.xml
	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/User.hbm.xml

	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/UserActivation.hbm.xml

	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/UserPackageRelation.hbm.xml

	SocioBoard/SocialSiteDataService/bin/Debug/Mappings/vwTwitterStats.hbm.xml
	SocioBoard/SocialSiteDataService/bin/Debug/SocialSiteDataService.exe
	SocioBoard/SocialSiteDataService/bin/Debug/SocialSiteDataService.pdb
	SocioBoard/SocialSiteDataService/bin/Debug/hibernate.cfg.xml
	SocioBoard/SocialSiteDataService/hibernate.cfg.xml

	SocioBoard/SocialSiteDataService/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	SocioBoard/SocialSiteDataService/obj/x86/Debug/ResolveAssemblyReference.cache

	SocioBoard/SocialSiteDataService/obj/x86/Debug/SocialSiteDataService.csproj.FileListAbsolute.txt

	SocioBoard/SocialSiteDataService/obj/x86/Debug/SocialSiteDataService.exe

	SocioBoard/SocialSiteDataService/obj/x86/Debug/SocialSiteDataService.pdb
	SocioBoard/SocioBoardScheduler/bin/Debug/hibernate.cfg.xml
	SocioBoard/SocioBoardScheduler/hibernate.cfg.xml
	SocioBoard/Web.config
	SocioBoard/bin/CloudSpongeLib.dll
	SocioBoard/bin/CloudSpongeLib.pdb
	SocioBoard/bin/GlobusGooglePlusLib.dll
	SocioBoard/bin/GlobusInstagramLib.dll
	SocioBoard/bin/GlobusLinkedinLib.dll
	SocioBoard/bin/GlobusTwitterLib.dll
	SocioBoard/bin/SocioBoard 1.0.dll
	SocioBoard/bin/SocioBoard 1.0.pdb
	SocioBoard/hibernate.cfg.xml
	SocioBoard/log.txt
	SocioBoard/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	SocioBoard/obj/Debug/ResolveAssemblyReference.cache
	SocioBoard/obj/Debug/SocioBoard 1.0.csproj.FileListAbsolute.txt
	SocioBoard/obj/Debug/SocioBoard 1.0.dll
	SocioBoard/obj/Debug/SocioBoard 1.0.pdb
	Socioboard/Features.aspx
	Socioboard/bin/GlobusGooglePlusLib.pdb
	Socioboard/bin/GlobusInstagramLib.pdb
	Socioboard/bin/GlobusLinkedinLib.pdb
	Socioboard/bin/GlobusMailLib.dll
	Socioboard/bin/GlobusMailLib.pdb
	Socioboard/bin/GlobusTwitterLib.pdb
	Socioboard/obj/Debug/SocioBoard
1.0.csprojResolveAssemblyReference.cache
New Updates

New Updates