修改了重复
last edit
Merge https://github.com/Jayin/SiyuanGroup

Conflicts:
	SiyuanGroup/AndroidManifest.xml
	SiyuanGroup/src/com/alumnigroup/api/UserAPI.java
	SiyuanGroup/src/com/alumnigroup/app/acty/Allmember.java
	SiyuanGroup/src/com/alumnigroup/app/acty/SpaceOther.java
	SiyuanGroup/src/com/alumnigroup/entity/User.java
	SiyuanGroup/src/com/alumnigroup/widget/PullAndLoadListView.java
Merge pull request #34 from VectorWen/master

nice