Merge pull request #433 from timschofield/develop

Develop
Use printer.png for printing
Add a margin at the bottom
Merge pull request #434 from fahadhatib/develop

Develop
Merge branch 'develop' of https://github.com/KwaMoja/KwaMoja into develop