Edit.
Edit.
Merge branch 'master' of https://github.com/TossShinHwa/CMS

Conflicts:
	src/YangKai.BlogEngine.Web.Mvc/Web.config
	src/YangKai.BlogEngine.Web.Mvc/version.txt