dingo-extensions

Merge branch '6.2' into rcin

Conflicts:
	app/ARiA.launch
	app/base/src/java/pl/psnc/dlibra/app/gui/admin/attributes/attribute/dictionarymgmt/WrappingListCellRenderer.java
	app/base/src/java/pl/psnc/dlibra/app/gui/admin/attributes/attribute/valueeditor/AttributeValueEditorController.java
	app/base/src/java/pl/psnc/dlibra/app/gui/admin/attributes/attribute/valueeditor/AttributeValueEditorView.java
	app/base/src/java/pl/psnc/dlibra/app/gui/common/metadataassist/MetadataAssistTextArea.java
	app/base/src/java/pl/psnc/dlibra/app/gui/editor/attributesvalueseditor/AttributeValuesNormalizer.java
	app/base/src/java/pl/psnc/dlibra/app/gui/editor/attributesvalueseditor/synonyms/SynonymsAction.java
	app/base/src/java/pl/psnc/dlibra/app/gui/editor/attributesvalueseditor/synonyms/SynonymsAppenderDialog.java
	app/base/src/java/pl/psnc/dlibra/app/gui/editor/attributesvalueseditor/treetable/AddSynonymsApplyCancelTarget.java
	app/base/src/java/pl/psnc/dlibra/app/gui/editor/attributesvalueseditor/treetable/AttributeValueCellEditor.java
	app/base/src/java/pl/psnc/dlibra/app/gui/editor/attributesvalueseditor/treetable/AttributeValueValueAdapter.java
	app/base/src/java/pl/psnc/dlibra/app/gui/editor/attributesvalueseditor/treetable/AttributesValuesEditor.java
	app/base/src/java/pl/psnc/dlibra/app/gui/editor/attributesvalueseditor/treetable/AttributesValuesTreeTable.java
	app/base/src/java/pl/psnc/dlibra/app/gui/editor/attributesvalueseditor/treetable/HTMLAttributeValueAdapter.java
	app/base/src/java/pl/psnc/dlibra/app/res/GUI.properties
	app/base/src/java/pl/psnc/dlibra/app/res/GUI_en.properties
	app/base/src/java/pl/psnc/dlibra/app/res/GUI_pl.properties
	common/base/src/java/pl/psnc/dlibra/metadata/attributes/AttributeTypeId.java
	common/base/src/java/pl/psnc/dlibra/metadata/attributes/AttributeValue.java
	webapp/base/src/assets/frontend/img/custom-images/logo.png
	webapp/base/src/assets/frontend/img/custom-images/main.jpg
	webapp/base/src/assets/frontend/img/custom-images/subpage-img.jpg
	webapp/base/src/assets/frontend/js/scripts/CHContext.js
	webapp/base/src/assets/frontend/js/scripts/FBCComponent.js
	webapp/base/src/assets/frontend/scss/dLibra/add-to-any/_a2a.scss
	webapp/base/src/assets/frontend/scss/dLibra/contrast/_contrast.scss
	webapp/base/src/assets/frontend/scss/dLibra/custom-changes/_custom-components.scss
	webapp/base/src/assets/frontend/scss/dLibra/custom-colors/_custom-colors.scss
	webapp/base/src/assets/frontend/scss/dLibra/global/_carousel.scss
	webapp/base/src/assets/frontend/scss/dLibra/global/_colors.scss
	webapp/base/src/assets/frontend/scss/dLibra/global/_footer.scss
	webapp/base/src/assets/frontend/scss/dLibra/global/_header.scss
	webapp/base/src/assets/frontend/scss/dLibra/global/_menu-desktop.scss
	webapp/base/src/assets/frontend/scss/dLibra/global/_objectbox.scss
	webapp/base/src/assets/frontend/scss/dLibra/global/_search.scss
	webapp/base/src/assets/frontend/scss/dLibra/page-advsearch/_advsearch.scss
	webapp/base/src/assets/frontend/scss/dLibra/page-contact/_footer.scss
	webapp/base/src/assets/frontend/scss/dLibra/page-content/_buttons.scss
	webapp/base/src/assets/frontend/scss/dLibra/page-content/_tab.scss
	webapp/base/src/assets/frontend/scss/dLibra/page-login/_login.scss
	webapp/base/src/assets/frontend/scss/dLibra/page-main/_component-mostviewed.scss
	webapp/base/src/assets/frontend/scss/dLibra/page-main/_component-news.scss
	webapp/base/src/assets/frontend/scss/dLibra/page-object/_download.scss
	webapp/base/src/assets/frontend/scss/dLibra/page-object/_main.scss
	webapp/base/src/assets/frontend/scss/dLibra/page-password/_password.scss
	webapp/base/src/assets/frontend/scss/dLibra/page-register/_register.scss
	webapp/base/src/assets/frontend/scss/dLibra/page-report/_main.scss
	webapp/base/src/assets/frontend/scss/dLibra/page-results/_results.scss
	webapp/base/src/assets/frontend/scss/dLibra/reusable/_addons.scss
	webapp/base/src/assets/frontend/scss/dLibra/reusable/_components.scss
	webapp/base/src/assets/frontend/scss/dLibra/reusable/_containers.scss
	webapp/base/src/assets/frontend/scss/dLibra/reusable/_headings.scss
	webapp/base/src/assets/frontend/scss/dLibra/reusable/_mixins.scss
	webapp/base/src/assets/frontend/scss/dLibra/reusable/_pagination.scss
	webapp/base/src/assets/frontend/scss/dLibra/reusable/_select.scss
	webapp/base/src/webapp/WEB-INF/components/resources/WEBAPP_en.xml
	webapp/base/src/webapp/WEB-INF/components/resources/WEBAPP_pl.xml
	webapp/base/src/webapp/WEB-INF/layout/templates/parts/footer-contact.vm
	webapp/base/src/webapp/WEB-INF/layout/templates/parts/header.vm
	webapp/base/src/webapp/WEB-INF/pages.xml
	webapp/base/src/webapp/WEB-INF/urlrewrite.xml
	webapp/base/src/webapp/style/dlibra/default/css/custom.css
	webapp/base/src/webapp/style/dlibra/default/css/main.css
	webapp/base/src/webapp/style/dlibra/default/img/custom-images/logo.png
	webapp/base/src/webapp/style/dlibra/default/img/custom-images/main.jpg
	webapp/base/src/webapp/style/dlibra/default/img/custom-images/subpage-img.jpg
	webapp/base/src/webapp/style/dlibra/default/js/main.min.js
	webapp/components/src/resources/components/templates/CollectionDescriptionComponent.vm
	webapp/components/src/resources/components/templates/CollectionsStructureComponent.vm
	webapp/components/src/resources/components/templates/ContactComponent.vm
	webapp/components/src/resources/components/templates/LanguagesComponent.vm
	webapp/components/src/resources/components/templates/LastViewedMenuComponent.vm
	webapp/components/src/resources/components/templates/NewsComponent.vm
	webapp/components/src/resources/components/templates/component_library.vm
	webapp/components/src/resources/components/templates/parts/pagination_bottom.vm
	webapp/components/src/resources/components/templates/parts/pagination_top.vm