Merge branch 'master' into client-server-detach

Conflicts:
	.gitignore
	client/src/app/article/detail/article-detail.coffee
	client/src/data/version.txt
	server dotnet/YangKai.BlogEngine.Web.Mvc/Controllers/OData/PostModule/CommentController.cs
	src/YangKai.BlogEngine.Web.Mvc/Content/app-admin/article/edit/article-edit.js
	src/YangKai.BlogEngine.Web.Mvc/Content/app-admin/article/edit/article-edit.min.js
	src/YangKai.BlogEngine.Web.Mvc/Content/app/article/detail/article-detail.js
	src/YangKai.BlogEngine.Web.Mvc/Content/app/article/detail/article-detail.min.js
	src/YangKai.BlogEngine.Web.Mvc/Views/Home/index.cshtml