1
Merge remote-tracking branch 'origin/master'

Conflicts:
	pctApp/src/com/pct/app/business/blog/BlogService.java
Merge branch 'master' of https://github.com/peichunting/web-by-google-app-engine.git
提取博客简短内容方法Blog.getBlogInfo(Text content)