Merge branch 'fix'

Author: pkempenaers

bower.json

@@ -27,16 +27,19 @@
     "tests"
   ],
   "dependencies": {
-    "angular": "~1"
+    "angular": "~1.5"
   },
   "devDependencies": {
-    "angular": "~1",
-    "angular-animate": "~1",
-    "angular-sanitize": "~1",
-    "angular-touch": "~1",
-    "angular-route": "~1",
+    "angular": "~1.5",
+    "angular-animate": "~1.5",
+    "angular-sanitize": "~1.5",
+    "angular-touch": "~1.5",
+    "angular-route": "~1.5",
     "bootstrap": "~3.1.1",
     "angular-highlightjs": "~0.2.7",
     "angular-bootstrap": "^1.3.1"
+  },
+  "resolutions": {
+    "angular": ">=1.4.0"
   }
 }

index.html

@@ -10,7 +10,7 @@
 	<link href='https://fonts.googleapis.com/css?family=Architects+Daughter' rel='stylesheet' type='text/css'>
 	<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.9.1/styles/github.min.css">
 	<script>
-		var staticPath = '/angularjs-dropdown-multiselect/pages/';
+		var staticPath = '/pages/';
 	</script>
 	<style>
 		.nav,
@@ -54,11 +54,11 @@ <h2>based on Bootstrap's dropdown</h2>
 		</div>
 	</footer>
 
-		<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.16/angular.js"></script>
-		<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.16/angular-route.js"></script>
-		<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.16/angular-sanitize.js"></script>
-		<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.16/angular-touch.min.js"></script>
-		<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/angular.js/1.2.16/angular-animate.js"></script>
+		<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.11/angular.js"></script>
+		<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.11/angular-route.js"></script>
+		<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.11/angular-sanitize.js"></script>
+		<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.11/angular-touch.min.js"></script>
+		<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.11/angular-animate.js"></script>
 		<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.0/highlight.min.js"></script>
 		<script type="text/javascript" src="https://rawgit.com/pc035860/angular-highlightjs/master/angular-highlightjs.js"></script>
 		<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.10.0/ui-bootstrap-tpls.js"></script>