group manager
Merge branch 'Beta1.2' of https://github.com/lejoying/im into Beta1.2
baidu map is complete
Merge branch 'Beta1.2' of https://github.com/lejoying/im into Beta1.2

Conflicts:
	微型公社/src/com/lejoying/wxgs/activity/mode/fragment/ChatFragment.java