Merge pull request #1 from JasonGuanGitHub/master

floatbuttonAndSliding
Merge pull request #2 from luzhitong/master

floatbuttonAndSliding