Merge pull request #248 from adityab/viewer-branding

Add NLNet and KO logos to viewer's about dialog.
Unbreak master page rendering of ODP files.

Fixes an infinite loop that tries to acquire a
master page element when given a master page
name, which crept in by mistake via 9984265c.