Refactored ButtonBase to simplify changes.
Merge branch 'master' of github.com:BSick7/Fayde