typo
Merge branch 'Beta1.5' of https://github.com/lejoying/im into Beta1.5
added NearbyActivity
Merge branch 'Beta1.5' of https://github.com/lejoying/im into Beta1.5

Conflicts:
	androidApp/AndroidManifest.xml