Merge pull request #45 from pcsmits/master

alpha set on button
Merge branch 'master' of https://github.com/MaritalWheat/homebase into blankfeed

merge uptream
taking in final staging commits