Squashed commit of the following:

commit b5c0f352709ea32d3dd6a69e54191c444c9d3e46
Merge: 411a396 55d31ae
Author: wsds <wsds888@163.com>
Date:   Wed Sep 10 11:18:53 2014 +0800

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

    Conflicts:
    	androidApp/src/com/open/welinks/model/API.java

commit 411a3964575d36fb07e112c234118bcfedb93293
Author: wsds <wsds888@163.com>
Date:   Wed Sep 10 11:17:23 2014 +0800

    SD data modified while user logOut.

commit 55d31aed7c186cf396324842a426c2c8962b0d21
Merge: f5ee683 97f83c0
Author: wjjm555 <139040491@qq.com>
Date:   Tue Sep 9 22:25:22 2014 +0800

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

    Conflicts:
    	androidApp/AndroidManifest.xml

commit f5ee683051700c748d340b9221ada07a3dba750e
Author: wjjm555 <139040491@qq.com>
Date:   Tue Sep 9 22:24:14 2014 +0800

    added NearbyActivity

commit 3298ad4f5ce0e5e38221a3450f9fa5302e6736b2
Merge: 5d87e4c 44b333b
Author: wjjm555 <139040491@qq.com>
Date:   Tue Sep 9 17:41:05 2014 +0800

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

commit 5d87e4ce089753737b9913287a6324de11e668a1
Author: wjjm555 <139040491@qq.com>
Date:   Tue Sep 9 11:10:42 2014 +0800

    typo