Merge branch 'develop'

davidenke · davidenke · commit 651ae3ce1dcd · 2016-05-24T13:31:59.000+02:00
* develop:
  added readme, updated demo

# Conflicts:
#	README.md
diff --git a/demo.html b/demo.html
@@ -6,7 +6,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
 
         <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Material+Icons|Open+Sans:400,300,600,700|Open+Sans+Condensed:300,700">
-        <link rel="stylesheet" href="node_modules/angular-material/angular-material.min.css">
+        <link rel="stylesheet" href="//ajax.googleapis.com/ajax/libs/angular_material/1.0.7/angular-material.min.css">
         <link rel="stylesheet" href="dist/mdKeyboard.min.css">
     </head>
     <body ng-cloak data-ng-controller="keyboardDemoCtrl">
@@ -24,10 +24,10 @@ <h1 class="md-headline">Angular Material Keyboard Demo</h1>
             </section>
         </div>
 
-        <script src="node_modules/angular/angular.min.js"></script>
-        <script src="node_modules/angular-aria/angular-aria.min.js"></script>
-        <script src="node_modules/angular-animate/angular-animate.min.js"></script>
-        <script src="node_modules/angular-material/angular-material.min.js"></script>
+        <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.5.5/angular.min.js"></script>
+        <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.5.5/angular-aria.min.js"></script>
+        <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.5.5/angular-animate.min.js"></script>
+        <script src="//ajax.googleapis.com/ajax/libs/angular_material/1.0.7/angular-material.min.js"></script>
         <script src="dist/mdKeyboard.js"></script>
 
         <script>
diff --git a/package.json b/package.json
@@ -4,10 +4,10 @@
     "name": "David Enke"
   },
   "dependencies": {
-      "angular": "1.4.9",
-      "angular-animate": "1.4.9",
-      "angular-aria": "1.4.9",
-      "angular-material": "1.0.5",
+      "angular": "1.5.5",
+      "angular-animate": "1.5.5",
+      "angular-aria": "1.5.5",
+      "angular-material": "1.0.8",
       "material-design-icons": "2.2.3"
   },
   "description": "Onscreen virtual keyboard for Angular (https://angularjs.org/) using Material (https://material.angularjs.org/)inspired by the Angular Virtual Keyboard by the-darc (https://github.com/the-darc/angular-virtual-keyboard).",
