fixed font size and line spacing
fixed padding/margin mainFrame and buttonFrame + fix wrong button pressed background in API < 21
added missing drawable from previous commit
merge to upstreap + fix button height on API 21
Merge remote-tracking branch 'upstream/master'
Merge pull request #1 from leinardi/master

Layout fixes