Merge pull request #1 from bagwanpankaj/development

DEV-1268 #comment fixed header and footer line rendering
DEV-1268 #comment mocked margin for header and footer