Proper margin calculation
Merge branch 'master' of github.com:clslrns/bitrix-painkiller