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

Conflicts:
	SiyuanGroup/res/layout/acty_allmember_header.xml
完善了dynamic 布局