Merge branch 'master' into dev/nmccready/issue_1460_control_checks

Author: nmccready

bower.json

@@ -24,9 +24,9 @@
     "tmp"
   ],
   "devDependencies": {
-    "angular-mocks": "~1.3.x",
+    "angular-mocks": "1.2 - 1.4",
     "uuid": "http://github.com/LiosK/UUID.js/archive/v3.2.tar.gz",
-    "angular-route": "~1.3.0",
+    "angular-route": "1.2 - 1.4",
     "bootstrap-without-jquery": "git://github.com/tagawa/bootstrap-without-jquery.git",
     "data-structures": "~1.4.2",
     "OverlappingMarkerSpiderfier": "git://github.com/nmccready/OverlappingMarkerSpiderfier.git"