fix footer margin
Merge branch 'dev'