Fix warning
Fix button
Merge branch 'master' of github.com:webim/BBUI