fixed merge conflict
tablet work
conflict solved
added fonts for mobile
added fonts
Merge remote-tracking branch 'origin/tal' into wes