Merge branch 'master-local' into master-dist

Author: patternfly-build

Gruntfile.js

@@ -179,8 +179,8 @@ module.exports = function (grunt) {
             'node_modules/patternfly/dist/js/patternfly-settings-charts.js',
             'node_modules/angular/angular.js',
             'node_modules/angular-dragdrop/src/angular-dragdrop.js',
-            'node_modules/angular-datatables/dist/angular-datatables.min.js',
-            'node_modules/angular-datatables/dist/plugins/select/angular-datatables.select.min.js',
+            'node_modules/angularjs-datatables/dist/angular-datatables.js',
+            'node_modules/angularjs-datatables/dist/plugins/select/angular-datatables.select.min.js',
             'node_modules/angular-sanitize/angular-sanitize.js',
             'node_modules/angular-animate/angular-animate.js',
             'node_modules/angular-ui-bootstrap/dist/ui-bootstrap-tpls.js',

README.md

@@ -120,8 +120,8 @@ Note:
    <script src="node_modules/jquery/dist/jquery.js"></script>
    <script src="node_modules/datatables.net/js/jquery.dataTables.js"></script>
    <script src="node_modules/datatables.net-select/js/dataTables.select.js"></script>
-   <script src="node_modules/angular-datatables/dist/angular-datatables.min.js"></script>
-   <script src="node_modules/angular-datatables/dist/plugins/select/angular-datatables.select.min.js"></script>
+   <script src="node_modules/angularjs-datatables/dist/angular-datatables.min.js"></script>
+   <script src="node_modules/angularjs-datatables/dist/plugins/select/angular-datatables.select.min.js"></script>
    ```
 7. (optional) The 'patternfly.canvas' module is not a dependency in the default angular 'patternfly' module.
    In order to use pfCanvasEditor or pfCanvas, you must add 'patternfly.canvas' as a dependency in your application:

bower.json

@@ -41,7 +41,7 @@
     "angular-animate": "1.5.*",
     "angular-bootstrap": "2.2.x",
     "angular-dragdrop": "1.0.13",
-    "angular-datatables": "^0.5.6",
+    "angularjs-datatables": "^0.5.7",
     "angular-drag-and-drop-lists": "2.0.0",
     "angular-sanitize": "1.5.*",
     "datatables.net": "^1.10.12",