more changes for automatic scaling on mobile
Merge branch 'master' into inabox