增加获取帮增加缓存支持
修改帮空间
修改用户空间
增加.gitigonre
1
12123
Merge branch 'master' of github.com:wewe89/liuxuebang into wewe89-master

Conflicts:
	.gitignore
	src/com/origwood/liuxue/service/AppService.java
	src/com/origwood/liuxue/service/URLs.java
Merge branch 'wewe89-master'

Conflicts:
	.gitignore
	bin/classes/com/actionbarsherlock/R$layout.class
	bin/classes/com/origwood/liuxue/AppStart.class
	bin/classes/com/origwood/liuxue/R$drawable.class
	bin/classes/com/origwood/liuxue/R$id.class
	bin/classes/com/origwood/liuxue/R$integer.class
	bin/classes/com/origwood/liuxue/R$layout.class
	bin/classes/com/origwood/liuxue/R$menu.class
	bin/classes/com/origwood/liuxue/R$string.class
	bin/classes/com/origwood/liuxue/R$style.class
	bin/classes/com/origwood/liuxue/R$styleable.class
	gen/com/actionbarsherlock/R.java
	gen/com/origwood/liuxue/R.java
增加用户设置，创建帮
新增找回密码
我的帮，粉丝
新增附近用户，留学达人
增加关注
Merge github.com:wewe89/liuxuebang into wewe89-master

Conflicts:
	.gitignore
	bin/AndroidManifest.xml
	bin/Liuxue.apk
	bin/R.txt
	bin/classes.dex
	bin/classes/com/actionbarsherlock/R$layout.class
	bin/classes/com/origwood/liuxue/AppStart.class
	bin/classes/com/origwood/liuxue/R$drawable.class
	bin/classes/com/origwood/liuxue/R$id.class
	bin/classes/com/origwood/liuxue/R$integer.class
	bin/classes/com/origwood/liuxue/R$layout.class
	bin/classes/com/origwood/liuxue/R$menu.class
	bin/classes/com/origwood/liuxue/R$string.class
	bin/classes/com/origwood/liuxue/R$style.class
	bin/classes/com/origwood/liuxue/R$styleable.class
	bin/classes/com/origwood/liuxue/adapter/GroupAdapter.class
	bin/classes/com/origwood/liuxue/adapter/ReplyAdapter.class
	bin/classes/com/origwood/liuxue/adapter/TopicAdapter.class
	bin/classes/com/origwood/liuxue/adapter/UserAdapter.class
	bin/classes/com/origwood/liuxue/common/UIHelper.class
	bin/classes/com/origwood/liuxue/service/AppService.class
	bin/classes/com/origwood/liuxue/service/URLs.class
	bin/classes/com/origwood/liuxue/ui/Base.class
	bin/classes/com/origwood/liuxue/ui/FragmentMessage.class
	bin/classes/com/origwood/liuxue/ui/FragmentMore.class
	bin/classes/com/origwood/liuxue/ui/FragmentMyGroup.class
	bin/classes/com/origwood/liuxue/ui/FragmentPublish.class
	bin/classes/com/origwood/liuxue/ui/FragmentSelect.class
	bin/classes/com/origwood/liuxue/ui/GroupSpace.class
	bin/classes/com/origwood/liuxue/ui/IconSetWin$2.class
	bin/classes/com/origwood/liuxue/ui/IconSetWin.class
	bin/classes/com/origwood/liuxue/ui/Login.class
	bin/classes/com/origwood/liuxue/ui/Main.class
	bin/classes/com/origwood/liuxue/ui/ModifyPwd.class
	bin/classes/com/origwood/liuxue/ui/MyFans.class
	bin/classes/com/origwood/liuxue/ui/PerfectInfo.class
	bin/classes/com/origwood/liuxue/ui/Publish.class
	bin/classes/com/origwood/liuxue/ui/Recommendation.class
	bin/classes/com/origwood/liuxue/ui/TopicDetail.class
	bin/classes/com/origwood/liuxue/ui/UserSpace$1.class
	bin/classes/com/origwood/liuxue/ui/UserSpace.class
	bin/classes/com/renren/api/connect/android/R$drawable.class
	bin/classes/com/renren/api/connect/android/R$id.class
	bin/classes/com/renren/api/connect/android/R$layout.class
	bin/resources.ap_
	gen/com/actionbarsherlock/R.java
	gen/com/origwood/liuxue/R.java
	gen/com/renren/api/connect/android/R.java
	project.properties
	src/com/origwood/liuxue/AppStart.java
	src/com/origwood/liuxue/service/AppService.java
	src/com/origwood/liuxue/service/URLs.java
	src/com/origwood/liuxue/ui/GroupSpace.java
	src/com/origwood/liuxue/ui/UserSpace.java
	src/com/origwood/liuxue/util/NetImageTools.java
	zxy/com/origwood/liuxue/ui/CreateGroup.java
	zxy/com/origwood/liuxue/ui/GetPhote.java
Merge branch 'wewe89-master'

Conflicts:
	.gitignore
	AndroidManifest.xml
	res/layout/activity_login_register.xml
	res/layout/activity_user.xml
	res/layout/fragment_more.xml
	res/layout/head_group.xml
	res/layout/item_group.xml
	res/layout/item_more.xml
	src/com/origwood/liuxue/bean/Constant.java
	src/com/origwood/liuxue/common/UIHelper.java
	src/com/origwood/liuxue/service/AppService.java
	src/com/origwood/liuxue/service/URLs.java
	src/com/origwood/liuxue/ui/FragmentMore.java
	src/com/origwood/liuxue/ui/GroupSpace.java
	src/com/origwood/liuxue/ui/Login.java
	src/com/origwood/liuxue/ui/UserSpace.java
	src/com/origwood/liuxue/util/NetImageTools.java
增加获得帖子详情和回复
关注用户
完成发帖功能
添加表情
重构