Merge branch 'master' of https://github.com/yangweijie/blog

Conflicts:
	Application/Home/View/red/Index/common.html