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

Conflicts:
	androidApp/src/com/open/welinks/controller/SquareSubController.java
	androidApp/src/com/open/welinks/view/SquareSubView.java
To optimize the square