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

Conflicts:
	client_android/Compath/bin/classes/com/satansin/android/compath/FeedActivity$1.class
	client_android/Compath/bin/classes/com/satansin/android/compath/FeedActivity$2.class
	client_android/Compath/bin/classes/com/satansin/android/compath/FeedActivity$FeedItemAdapter$ViewHolder.class
	client_android/Compath/bin/classes/com/satansin/android/compath/FeedActivity$FeedItemAdapter.class
	client_android/Compath/bin/classes/com/satansin/android/compath/FeedActivity$GetFeedTask.class
	client_android/Compath/bin/classes/com/satansin/android/compath/FeedActivity$MyLocationListenner.class
	client_android/Compath/bin/classes/com/satansin/android/compath/FeedActivity$PlaceholderFragment$1.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/jarlist.cache
	client_android/Compath/bin/resources.ap_
Merge branch 'master' of github.com:satansin/compath