add organisation-logo token, update safe-logo token behaviour (addresses #744)
fix unit tests for reporting subsystem
 attempt to fix strange Windows 8 bug (addresses #735)