Conflicts: .classpath main/webapp/modules/core/langs/translation-en.json main/webapp/modules/core/scripts/dialogs/extend-data-preview-dialog.js Closes #363 and #56.