Remove the Kooboo.Connect from the solution file.
Extract reset_check_relateds.
Fixed showing grid header twice issue.
Update SampleSite template.
Upgrade tinymce to 4.0.2.
change sidebar icon and content-block style
Possible to set the compact attribute individually.
<add filename="~/Scripts/codeMirror/lib/codemirror.js" compact="false"/>
Merge branch 'master' of https://github.com/Kooboo/CMS
little fixed for content-block.
Merge branch 'master' of https://github.com/Kooboo/CMS
Repository list page.
new sidebar icon.
Merge branch 'master' into customized

Conflicts:
	Kooboo.CMS/Kooboo.CMS.Web/Areas/Account/Controllers/LogOnController.cs
	Kooboo.CMS/Kooboo.CMS.Web/Areas/Membership/Views/Membership/Index.cshtml
	Kooboo.CMS/Kooboo.CMS.Web/Areas/Membership/Views/Membership/_MembershipNode.cshtml
	Kooboo.CMS/Kooboo.CMS.Web/Areas/Membership/WebResources.config
	Kooboo.CMS/Kooboo.CMS.Web/Cms_Data/Account/Users/admin.config
	Kooboo.CMS/Kooboo.CMS.Web/Kooboo.CMS.Web.csproj
	Kooboo.CMS/Kooboo.CMS.sln