chat service
chat
notification png
Merge branch 'master' of https://github.com/njuyyz/ebayFriends

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	AndroidManifest.xml
	src/activity/MainActivity.java