jonathan.20140711.914
jonathan.20140711.1037
Merge branch 'master' of https://github.com/VAS2Nets/Fuse

Conflicts:
	bin/classes/com/actionbarsherlock/R$layout.class
	bin/classes/com/csipsimple/R$id.class
	bin/classes/com/csipsimple/R$layout.class
	bin/classes/com/vas2nets/fuse/MainActivity$1.class
	bin/classes/com/vas2nets/fuse/MainActivity$DrawerItemClickListener.class
	bin/classes/com/vas2nets/fuse/MainActivity$InsertIntoDB.class
	bin/classes/com/vas2nets/fuse/MainActivity$SaveMyProfile.class
	bin/classes/com/vas2nets/fuse/MainActivity.class
	bin/classes/com/vas2nets/fuse/R$id.class
	bin/classes/com/vas2nets/fuse/R$integer.class
	bin/classes/com/vas2nets/fuse/R$layout.class
	bin/classes/com/vas2nets/fuse/R$menu.class
	bin/classes/com/vas2nets/fuse/R$string.class
	bin/classes/com/vas2nets/fuse/R$style.class
	bin/classes/com/vas2nets/fuse/R$styleable.class
	bin/classes/com/vas2nets/fuse/R$xml.class
	bin/classes/com/vas2nets/fuse/contact/ContactDetailsActivity.class
	bin/classes/com/vas2nets/fuse/contact/FragmentContacts$1.class
	bin/classes/com/vas2nets/fuse/contact/FragmentContacts$ContactsCursorAdapter.class
	bin/classes/com/vas2nets/fuse/contact/FragmentContacts.class
	bin/classes/com/vas2nets/fuse/contact/NotMemberActivity.class
	bin/classes/com/vas2nets/fuse/contact/SelectContactsActivity$ContactsSelectCursorAdapter.class
	bin/classes/com/vas2nets/fuse/contact/SelectContactsActivity.class
	bin/classes/com/vas2nets/fuse/home/FragmentHome$FeedDataListener.class
	bin/classes/com/vas2nets/fuse/home/FragmentHome$HomeAdapter.class
	bin/classes/com/vas2nets/fuse/home/FragmentHome.class
	bin/classes/com/vas2nets/fuse/home/FragmentHomeSwipe.class
	bin/classes/com/vas2nets/fuse/location/LocationActivity.class
	bin/classes/com/vas2nets/fuse/location/LocationAnotherActivity$CustomInfoWindowAdapter.class
	bin/classes/com/vas2nets/fuse/location/LocationAnotherActivity.class
	bin/classes/com/vas2nets/fuse/location/MyLocationActivity.class
	bin/classes/com/vas2nets/fuse/navigation/NavDrawerListAdapter.class
	bin/classes/com/vas2nets/fuse/profile/EditProfileFragment.class
	bin/classes/com/vas2nets/fuse/profile/FragmentProfile$UserCursorAdapter.class
	bin/classes/com/vas2nets/fuse/profile/FragmentProfile.class
	bin/classes/com/vas2nets/fuse/profile/PFragment.class
	bin/classes/com/vas2nets/fuse/profile/UpdateProfileActivity$UpdateMyProfile.class
	bin/classes/com/vas2nets/fuse/profile/UpdateProfileActivity.class
	bin/classes/com/vas2nets/fuse/share/ShareActivity$MyAdapter.class
	bin/classes/com/vas2nets/fuse/share/ShareActivity.class
	bin/classes/com/vas2nets/fuse/signup/RegisterPhoneNumberActivity.class
	bin/classes/com/vas2nets/fuse/signup/VerifyPinActivity.class
	bin/classes/com/vas2nets/fuse/sip/call/FragmentSipCallList$CallListCursorAdapter.class
	bin/classes/com/vas2nets/fuse/sip/call/FragmentSipCallList.class
	bin/classes/com/vas2nets/fuse/sip/call/SipCallActivity.class
	bin/classes/com/vas2nets/fuse/sip/chat/ChatActivity$5.class
	bin/classes/com/vas2nets/fuse/sip/chat/ChatActivity$6.class
	bin/classes/com/vas2nets/fuse/sip/chat/ChatActivity$ChatListCursorAdapter.class
	bin/classes/com/vas2nets/fuse/sip/chat/ChatActivity.class
	bin/classes/com/vas2nets/fuse/sip/chat/FragmentChatList$ChatListCursorAdapter.class
	bin/classes/com/vas2nets/fuse/sip/chat/FragmentChatList.class
	bin/classes/com/vas2nets/fuse/sip/chat/FragmentSipChatList$ChatListCursorAdapter.class
	bin/classes/com/vas2nets/fuse/sip/chat/FragmentSipChatList.class
	bin/classes/com/vas2nets/fuse/sip/chat/SipChatActivity$4.class
	bin/classes/com/vas2nets/fuse/sip/chat/SipChatActivity$ChatListCursorAdapter.class
	bin/classes/com/vas2nets/fuse/sip/chat/SipChatActivity.class
	bin/classes/com/vas2nets/fuse/sip/core/CallActivity.class
	bin/classes/com/vas2nets/fuse/sms/SMSActivity$SMSListCursorAdapter.class
	bin/classes/com/vas2nets/fuse/sms/SMSActivity.class
	bin/classes/com/vas2nets/fuse/social/core/AddSocialActivity$ResponseListener.class
	bin/classes/com/vas2nets/fuse/social/core/CustomSocialAdapter.class
	bin/classes/com/vas2nets/fuse/social/facebook/FacebookFriendDetailActivity.class
	bin/classes/com/vas2nets/fuse/social/facebook/FragmentFacebook$FacebookAdapter.class
	bin/classes/com/vas2nets/fuse/social/facebook/FragmentFacebook$FeedDataListener.class
	bin/classes/com/vas2nets/fuse/social/facebook/FragmentFacebook.class
	bin/classes/com/vas2nets/fuse/social/facebook/FragmentFacebookFriends$ContactAdapter.class
	bin/classes/com/vas2nets/fuse/social/facebook/FragmentFacebookFriends$ContactDataListener.class
	bin/classes/com/vas2nets/fuse/social/facebook/FragmentFacebookFriends.class
	bin/classes/com/vas2nets/fuse/social/facebook/FragmentFacebookShare.class
	bin/classes/com/vas2nets/fuse/social/facebook/FragmentFacebookSwipe.class
	bin/classes/com/vas2nets/fuse/social/instagram/FragmentInstagramFollowers$ContactAdapter.class
	bin/classes/com/vas2nets/fuse/social/instagram/FragmentInstagramFollowers$ContactDataListener.class
	bin/classes/com/vas2nets/fuse/social/instagram/FragmentInstagramFollowers.class
	bin/classes/com/vas2nets/fuse/social/instagram/FragmentInstagramHome$FeedDataListener.class
	bin/classes/com/vas2nets/fuse/social/instagram/FragmentInstagramHome$InstagramAdapter.class
	bin/classes/com/vas2nets/fuse/social/instagram/FragmentInstagramHome.class
	bin/classes/com/vas2nets/fuse/social/instagram/FragmentInstagramShare.class
	bin/classes/com/vas2nets/fuse/social/instagram/FragmentInstagramSwipe.class
	bin/classes/com/vas2nets/fuse/social/linkedin/FragmentKLinkedInShare.class
	bin/classes/com/vas2nets/fuse/social/linkedin/FragmentLinkedIn$FeedDataListener.class
	bin/classes/com/vas2nets/fuse/social/linkedin/FragmentLinkedIn$LinkedInAdapter.class
	bin/classes/com/vas2nets/fuse/social/linkedin/FragmentLinkedIn.class
	bin/classes/com/vas2nets/fuse/social/linkedin/FragmentLinkedInConnect$ContactAdapter.class
	bin/classes/com/vas2nets/fuse/social/linkedin/FragmentLinkedInConnect$ContactDataListener.class
	bin/classes/com/vas2nets/fuse/social/linkedin/FragmentLinkedInConnect.class
	bin/classes/com/vas2nets/fuse/social/linkedin/FragmentLinkedInSwipe.class
	bin/classes/com/vas2nets/fuse/social/twitter/FragmentTwitter$DownloadTwitterTask.class
	bin/classes/com/vas2nets/fuse/social/twitter/FragmentTwitter$MyAdapter.class
	bin/classes/com/vas2nets/fuse/social/twitter/FragmentTwitter.class
	bin/classes/com/vas2nets/fuse/social/twitter/FragmentTwitterFollowers.class
	bin/classes/com/vas2nets/fuse/social/twitter/FragmentTwitterShare.class
	bin/classes/com/vas2nets/fuse/social/twitter/FragmentTwitterSwipe.class
commit1
latest
latest