Merge branch 'master' into work
set font-size for small display
Merge branch 'work'