j
Merge branch 'zhxy'
Merge branch 'master' of https://github.com/wuliwuwai/liuxuebang.git
Incomplete - task : Liuxue
Incomplete - task : Liuxue
Incomplete - task : Liuxue 
重新提交资源文件
Incomplete - task : Liuxue
Incomplete - task : Liuxue
Incomplete - task : Liuxue
Incomplete - task : Liuxue
添加创建帮方法

补全注释
添加有参数的构造方法
更新个人资料和创建帮用
默认上传的图片
创建帮
添加了Editview的样式
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