空间、动态显示了、资料还不可以更新。
Merge branch 'master' of https://github.com/VectorWen/SiyuanGroup

Conflicts:
	SiyuanGroup/.classpath
	SiyuanGroup/src/com/alumnigroup/api/UserAPI.java
	SiyuanGroup/src/com/alumnigroup/app/acty/Main.java
...
更新背景图，头像
Merge branch 'master' of https://github.com/VectorWen/SiyuanGroup
 ss