Change keypad layout to calculator
Merge branch 'master' into gh-pages