Merge pull request #3 from Jayin/master

05an
ss
Merge branch 'master' of https://github.com/VectorWen/SiyuanGroup

Conflicts:
	SiyuanGroup/res/layout/acty_allmember_header.xml
完善了dynamic 布局
Merge pull request #25 from VectorWen/master

完善了dynamic 布局