213
123
Merge branch 'master' of
https://github.com/jiu9x9uij/GroupUpClientAndroid.git

Conflicts:
	src/com/example/groupupclientandroid/connector/ServerConnector.java