do nothing
Merge branch 'master' of https://github.com/guagua/meet

Conflicts:
	bin/classes/com/baidu/meet/ListView/BdIListCommonPullView.class
	bin/classes/com/baidu/meet/R$drawable.class
	bin/classes/com/baidu/meet/R$id.class
	bin/classes/com/baidu/meet/R$layout.class
	bin/classes/com/baidu/meet/R$string.class
	bin/classes/com/baidu/meet/R$style.class
	bin/classes/com/baidu/meet/model/ChatListModel.class
	bin/classes/com/baidu/meet/register/EditHeadActivity.class
	bin/classes/com/baidu/meet/talk/MeetListAdapter$ViewHolder.class
	bin/classes/com/baidu/meet/talk/MeetListAdapter.class
	bin/classes/com/baidu/meet/view/MultiImageView.class
	bin/classes/com/baidu/meet/view/UrlDragImageView.class
删除无用的bin文件