Merge branch 'master' into em-device-ports-json

Conflicts:
	Netdisco/share/views/ajax/datatabledefaults.tt

Netdisco/share/views/ajax/datatabledefaults.tt

@@ -45,6 +45,10 @@
       data.search.search = "";
       // make sure paging position is not saved
       data.start = 0;
+      [% IF is_custom_report %]
+      // disable sorting for custom reports
+      data.order = "";
+      [% END %]
     },
     "stateLoadParams": function (settings, data) {
       // load all sidebar settings

Netdisco/share/views/ajax/report/generic_report.tt

@@ -20,6 +20,7 @@
 <script>
 $(document).ready(function() {
   $('#rg-data-table').dataTable({
+    "order": [],
 [% INCLUDE 'ajax/datatabledefaults.tt' -%]
   } );
 } );