由明阳第一次提交
Merge branch 'master' into liu

Conflicts:
	AndroidManifest.xml
	assets/note.html
	proguard-project.txt
	project.properties
	res/drawable-hdpi/add_btn.png
	res/drawable-hdpi/chatting_setmode_voice_btn_normal.png
	res/drawable-hdpi/chatting_setmode_voice_btn_pressed.png
	res/drawable/tab_indicator_ab_example.xml
	res/layout/account_settings.xml
	res/layout/activity_chat.xml
	res/layout/activity_draw.xml
	res/layout/activity_main.xml
	res/layout/find_list_item.xml
	res/layout/find_list_layout.xml
	res/layout/fragment_friends.xml
	res/layout/fragment_home.xml
	res/layout/friend_item.xml
	res/layout/hand_write_lay.xml
	res/layout/home.xml
	res/layout/home_list_item.xml
	res/layout/lay_top_actionbar.xml
	res/layout/list_item.xml
	res/layout/login_layout.xml
	res/layout/question_add_layout.xml
	res/layout/question_popup_layout.xml
	res/layout/register_layout.xml
	res/layout/tab_view.xml
	res/layout/test_actionbar_viewpager.xml
	res/layout/test_sidebar.xml
	res/layout/voice_rcd_hint_window.xml
	res/menu/actionbar_menu.xml
	res/values-sw600dp/dimens.xml
	res/values-sw720dp-land/dimens.xml
	res/values-v11/styles.xml
	res/values-v14/styles.xml
	res/values/colors.xml
	res/values/ids.xml
	res/values/strings.xml
	res/values/styles.xml
	res/values/theme.xml
	src/scu/android/application/MyApplication.java
	src/scu/android/fragment/FindFragment.java
	src/scu/android/fragment/FriendFragment.java
	src/scu/android/fragment/HomeFragment.java
	src/scu/android/note/ActionBarActivity.java
	src/scu/android/note/HomeViewPage.java
	src/scu/android/ui/ChatMainActivity.java
	src/scu/android/ui/RegisterActivity.java
	src/scu/android/ui/SlideMenuUtil.java
	src/scu/android/ui/TabViewPagerAdapter.java
	src/scu/android/util/HomeAdapter.java
增加标准的过滤文件gitignore