opzimition.
Merge branch 'Beta2.0' of https://github.com/lejoying/im into Beta2.0

Conflicts:
	androidApp/src/com/open/welinks/view/ShareSubView.java