Merge branch 'master' of https://github.com/VectorWen/SiyuanGroup into VectorWen-master

Conflicts:
	SiyuanGroup/AndroidManifest.xml
	SiyuanGroup/proguard-project.txt
	SiyuanGroup/res/layout/acty_allmember.xml
	SiyuanGroup/res/values/styles.xml
	SiyuanGroup/src/com/alumnigroup/api/RestClient.java
	SiyuanGroup/src/com/alumnigroup/api/UserAPI.java
	SiyuanGroup/src/com/alumnigroup/app/AppStart.java
	SiyuanGroup/src/com/alumnigroup/app/acty/Allmember.java
	SiyuanGroup/src/com/alumnigroup/entity/User.java