update
update

update
Merge pull request #2 from luzhitong/master

floatbuttonAndSliding
Merge pull request #2 from JasonGuanGitHub/master

merge fromJasonGuanGitHub