rename 'screen padding' to 'margin screen'
Merge remote-tracking branch 'origin/master'