Fix margin calculation problem, and add myuser_fullname and myuser_logo
into standard ODT replacement
Merge pull request #918 from FHenry/develop

Fix margin calculation problem, and add myuser_fullname and myuser_logo