Finaltest

Merge to add our logo and also update all the templates to display the logo in the top left corner of each page