need pull
Merge branch 'master' of
https://github.com/jiu9x9uij/GroupUpClientAndroid.git

Conflicts:
	res/layout/tab_preferences.xml
Merge branch 'master' of https://github.com/jiu9x9uij/GroupUpClientAndroid.git
Resolved Conflict.
Merge branch 'master' of https://github.com/jiu9x9uij/GroupUpClientAndroid.git