Button refinement
Merge branch 'master' of github.com:jasand/fagdag2-android1