添加一段代码
刘洋今天提交
刘洋添加pinyin以及部分代码
合并所有
由明阳
肖逸飞提交：修改部分界面
添加
添加附近的人和群组资源文件
肖由合并
刘洋
全部合并成功
刘洋换位置后第一次提交
肖刘合并
修改上传
Merge remote-tracking branch 'origin/origin'

Conflicts:
	.classpath
	AndroidManifest.xml
	project.properties
	res/anim/btn_selector.xml
	res/drawable/button_small_white_style.xml
	res/layout/activity_top.xml
	res/layout/chat_input_field.xml
	res/layout/fragment_find.xml
	res/layout/friend_search_result.xml
	res/layout/group_item.xml
	res/layout/group_list_item.xml
	res/layout/group_list_lay.xml
	res/layout/nearby_list_item.xml
	res/layout/question_popup_layout.xml
	res/layout/question_reply.xml
	res/layout/register_layout.xml
	res/layout/search_bar_lay.xml
	res/values/colors.xml
	res/values/ids.xml
	res/values/styles.xml
	src/scu/android/activity/IssueQuestionActivity.java
	src/scu/android/activity/ReplyQuestionActivity.java
	src/scu/android/activity/ReplysActiviy.java
	src/scu/android/activity/ScanPhotosActivity.java
	src/scu/android/application/MyApplication.java
	src/scu/android/base/CommonEditor.java
	src/scu/android/db/DBHelper.java
	src/scu/android/db/QuestionDao.java
	src/scu/android/db/ReplyDao.java
	src/scu/android/db/UserDao.java
	src/scu/android/entity/Reply.java
	src/scu/android/fragment/QuestionsFragment.java
	src/scu/android/note/ActionBarActivity.java
	src/scu/android/ui/AccountSettingActivity.java
	src/scu/android/ui/ActivityMultiRoom.java
	src/scu/android/ui/ModifyAvatarActivity.java
	src/scu/android/ui/PhotosAdapter.java
	src/scu/android/ui/TabViewPagerAdapter.java
	src/scu/android/ui/ThumbnailsAdapter.java
	src/scu/android/util/ActivitySupport.java
	src/scu/android/util/AppUtils.java
	src/scu/android/util/Constants.java
	src/scu/android/util/DownloadUtils.java
	src/scu/android/util/IActivitySupport.java
	src/scu/android/util/UploadUtils.java