Different default display for URIs

Changed the default URI display from icons to HTML anchors.
If a user wants to view the URIs as icons, the optional query string
parameter 'showUri' can be used, with the value set to 'false', i.e.
"&showUri=false".
Conflict resolution

Conflict resolution.