aaa
m
Merge branch 'master' of github.com:satansin/compath

Conflicts:
	client_android/Compath/bin/AndroidManifest.xml
	client_android/Compath/bin/R.txt
	client_android/Compath/bin/classes/android/support/v7/appcompat/R$layout.class
	client_android/Compath/bin/classes/com/satansin/android/compath/DiscussActivity$1.class
	client_android/Compath/bin/classes/com/satansin/android/compath/DiscussActivity$CancelFavorGroupTask.class
	client_android/Compath/bin/classes/com/satansin/android/compath/DiscussActivity$CheckGroupFavoredTask.class
	client_android/Compath/bin/classes/com/satansin/android/compath/DiscussActivity$EnterGroupTask.class
	client_android/Compath/bin/classes/com/satansin/android/compath/DiscussActivity$ExitGroupTask.class
	client_android/Compath/bin/classes/com/satansin/android/compath/DiscussActivity$FavorGroupTask.class
	client_android/Compath/bin/classes/com/satansin/android/compath/DiscussActivity$MessageAdapter$ViewHolder.class
	client_android/Compath/bin/classes/com/satansin/android/compath/DiscussActivity$MessageAdapter.class
	client_android/Compath/bin/classes/com/satansin/android/compath/DiscussActivity$ReceivingThread$1.class
	client_android/Compath/bin/classes/com/satansin/android/compath/DiscussActivity$ReceivingThread.class
	client_android/Compath/bin/classes/com/satansin/android/compath/DiscussActivity$SendMessageTask.class
	client_android/Compath/bin/classes/com/satansin/android/compath/DiscussActivity.class
	client_android/Compath/bin/classes/com/satansin/android/compath/FavoriteGroupsActivity.class
	client_android/Compath/bin/classes/com/satansin/android/compath/FeedActivity$FeedItemAdapter.class
	client_android/Compath/bin/classes/com/satansin/android/compath/FeedActivity$PlaceholderFragment.class
	client_android/Compath/bin/classes/com/satansin/android/compath/FeedActivity.class
	client_android/Compath/bin/classes/com/satansin/android/compath/GroupCreationActivity.class
	client_android/Compath/bin/classes/com/satansin/android/compath/LocationCreationActivity.class
	client_android/Compath/bin/classes/com/satansin/android/compath/LocationSelectionActivity.class
	client_android/Compath/bin/classes/com/satansin/android/compath/LoginActivity$1.class
	client_android/Compath/bin/classes/com/satansin/android/compath/LoginActivity.class
	client_android/Compath/bin/classes/com/satansin/android/compath/MapSelectionActivity.class
	client_android/Compath/bin/classes/com/satansin/android/compath/MygroupsActivity.class
	client_android/Compath/bin/classes/com/satansin/android/compath/PersonalSettingsActivity$1.class
	client_android/Compath/bin/classes/com/satansin/android/compath/PersonalSettingsActivity$2.class
	client_android/Compath/bin/classes/com/satansin/android/compath/PersonalSettingsActivity$3.class
	client_android/Compath/bin/classes/com/satansin/android/compath/PersonalSettingsActivity$4.class
	client_android/Compath/bin/classes/com/satansin/android/compath/PersonalSettingsActivity$GetMyIconThumbTask.class
	client_android/Compath/bin/classes/com/satansin/android/compath/PersonalSettingsActivity$GetMyIconUrlTask.class
	client_android/Compath/bin/classes/com/satansin/android/compath/PersonalSettingsActivity$GetMycityTask.class
	client_android/Compath/bin/classes/com/satansin/android/compath/PersonalSettingsActivity$LogoutTask.class
	client_android/Compath/bin/classes/com/satansin/android/compath/PersonalSettingsActivity.class
	client_android/Compath/bin/classes/com/satansin/android/compath/R$anim.class
	client_android/Compath/bin/classes/com/satansin/android/compath/R$array.class
	client_android/Compath/bin/classes/com/satansin/android/compath/R$attr.class
	client_android/Compath/bin/classes/com/satansin/android/compath/R$bool.class
	client_android/Compath/bin/classes/com/satansin/android/compath/R$color.class
	client_android/Compath/bin/classes/com/satansin/android/compath/R$dimen.class
	client_android/Compath/bin/classes/com/satansin/android/compath/R$drawable.class
	client_android/Compath/bin/classes/com/satansin/android/compath/R$id.class
	client_android/Compath/bin/classes/com/satansin/android/compath/R$integer.class
	client_android/Compath/bin/classes/com/satansin/android/compath/R$layout.class
	client_android/Compath/bin/classes/com/satansin/android/compath/R$menu.class
	client_android/Compath/bin/classes/com/satansin/android/compath/R$string.class
	client_android/Compath/bin/classes/com/satansin/android/compath/R$style.class
	client_android/Compath/bin/classes/com/satansin/android/compath/R$styleable.class
	client_android/Compath/bin/classes/com/satansin/android/compath/RegisterActivity$1.class
	client_android/Compath/bin/classes/com/satansin/android/compath/RegisterActivity.class
	client_android/Compath/bin/dexedLibs/android-support-v4-4c0f1e28e8b35923ad2f12c764967d4e.jar
	client_android/Compath/bin/dexedLibs/android-support-v7-appcompat-eda06a66457658100511e0171db4b950.jar
	client_android/Compath/bin/dexedLibs/appcompat_v7-399d70d61f1d2f29f0985d00585521a2.jar
	client_android/Compath/bin/dexedLibs/baidumapapi_v2_4_1-23cfa7681bbe9fcc5e138ec8cf8d6ca3.jar
	client_android/Compath/bin/dexedLibs/locSDK_4.1-87165a59f4faeaed198abf9b53932724.jar
	client_android/Compath/gen/android/support/v7/appcompat/R.java
	client_android/Compath/gen/com/satansin/android/compath/R.java
	client_android/Compath/src/com/satansin/android/compath/DiscussActivity.java
	client_android/Compath/src/com/satansin/android/compath/PersonalSettingsActivity.java