fixed changing padding-top of body problem
Merge branch 'master' into qa