Merge pull request #385 from timschofield/develop

Make the findLogoFile() function faster, more efficient, and more readab...
Fix links to work as a block, and remove unnecessary html tags
Merge pull request #386 from fahadhatib/develop

Fix links to work as a block, and remove unnecessary html tags