fixbug.
Merge branch 'master' of http://github.com/micanzhang/focus

Conflicts:
	app/controller/post.py