Merge remote-tracking branch 'origin/1.7' into 2.x

# Conflicts:
#	public/js/pimcore/asset/helpers/grid.js

Author: robertSt7

public/js/pimcore/asset/helpers/grid.js

@@ -258,6 +258,11 @@ pimcore.asset.helpers.grid = Class.create({
                         text: t(field.label), sortable: true, dataIndex: field.key, editable: false,
                         width: this.getColumnWidth(field, 210), locked: this.getColumnLock(field), filter: 'string', renderer: Ext.util.Format.htmlEncode
                     });
+                } else if (key === "id") {
+                    gridColumns.push({
+                        text: t(field.label), width: this.getColumnWidth(field, 130), locked: this.getColumnLock(field), sortable: true, filter: 'numeric',
+                        dataIndex: field.key
+                    });
                 } else {
                     gridColumns.push({
                         text: t(field.label), width: this.getColumnWidth(field, 130), locked: this.getColumnLock(field), sortable: true,

public/js/pimcore/layout/portlets/modificationStatistic.js

@@ -51,6 +51,7 @@ pimcore.layout.portlets.modificationStatistic = Class.create(pimcore.layout.port
             height: 275,
             items: {
                 xtype: 'cartesian',
+                downloadServerUrl: '/disabled-server-url/',
                 store: store,
                 legend: {
                     docked: 'right'