基本完成，除了搜索那里
Merge branch 'master' of github.com:hellosysucas/SmallTalk

Conflicts:
	mytalk/models.py
	mytalk/static/mytalk/js/friends.js
	mytalk/templates/mytalk/friends.html
	mytalk/tests.py
	mytalk/views.py

基本完成，除了搜索那里