local submit
hope it can success:
thirst commit
commit
Merge branch 'master' of https://github.com/luoyou/sns

Conflicts:
	protected/controllers/TalkListController.php
	protected/runtime/application.log
	protected/views/layouts/main.php
	protected/views/talkList/_view.php
	protected/views/talkList/index.php