Optimize the ChatActivity
Merge branch 'Beta2.1' of https://github.com/lejoying/im into Beta2.1

Conflicts:
	androidApp/src/com/open/welinks/model/Data.java
To optimize the ChatActivity
add locationMessage to chat
add send card to chat
To optimize the chat and fix a bug of init current square
To optimize the chat
added more gif
Merge branch 'Beta2.1' of https://github.com/lejoying/im into Beta2.1

Conflicts:
	androidApp/src/com/open/welinks/controller/SquareSubController.java
	androidApp/src/com/open/welinks/view/ShareSubView.java
	androidApp/src/com/open/welinks/view/SquareSubView.java
fix the bug