Merge pull request #11 from iamjohnli/master

john update
自适应布局的修改

自适应布局的修改
Merge pull request #19 from CrazyDerekLi/master

自适应布局的修改