before i edit
Merge branch 'master' of https://github.com/Jayin/SiyuanGroup

Conflicts:
	SiyuanGroup/res/layout/acty_allmember.xml