Conflicts:

	bower.json

bower.json

@@ -31,7 +31,7 @@
         "README.md"
     ],
     "dependencies": {
-        "bootstrap": ">= 3.0.0",
+        "bootstrap": ">= 3.1.0",
         "jquery": ">= 1.9.0"
     }
 }