# Conflicts:
#	add/data/xql/getLinkTarget.xql
#	app/Application.js
#	app/view/desktop/TopBar.js
#	packages/eoTheme/sass/var/button/Button.scss

All conflicts solved.

Fix for Edirom in xul-wrapper: scroll bars in windows when annots or measure numbers are visible; help button not needed in xul-wrapper; z-index.

Disabled colum "No". Added new column "Source" for sigla (from OPERA Edirom Online). Changed widths of columns.

Lauout and design of Annotation Symbols (categories), Search Window (from the OPERA Edirom Online) and Help Window (form the OPERA Edirom Online)

Localization of contents and UI. Has to be refined. Now its often just "de or not". Also added support to display annotID in the AnnotView's metadata box.

Hide Source-Labels in Annot-Meta-Areas.