Merge branch 'f-fix-merge' into 'dev'

CHANGELOG.md

build.properties.d/00_default.properties

src/core/js/ext_cosmetics.js

src/core/js/ext_entity_acl.js

src/core/js/ext_prop_display.js

src/core/js/ext_trigger_crawler_form.js

src/core/js/form_elements.js

src/core/js/form_panel.js

src/core/js/query_form.js

src/core/js/webcaosdb.js

src/core/xsl/entity.xsl

src/core/xsl/navbar.xsl

test/core/js/modules/ext_cosmetics.js.js

test/core/js/modules/form_panel.js.js