And author text
Merge branch 'master' of https://github.com/zhengmingc/WCQiushi

Conflicts:
	ContentCell.m