Fix some bug
Merge remote-tracking branch 'origin'

Conflicts:
	app/views/weibo_users/index.html.erb