Merge branch 'master' into forum_button

Author: knorth55

.travis

@@ -226,9 +226,15 @@
          `(:rot ,(rpy-matrix 0 0 0)
                 :pos ,(float-vector -750.0 6829.0 51.6065)
                 :name "/eng2/7f/room73A3-front1")
-	 `(:rot ,(rpy-matrix pi/2 0 0)
-			:pos ,(float-vector 5500 6196 51.6065)
+	 `(:rot ,(rpy-matrix 0 0 0)
+			:pos ,(float-vector 5600 6000 51.6065)
 			:name "/eng2/7f/room73B2-fetch-dock-front")
+	 `(:rot ,(rpy-matrix 0 0 0)
+			:pos ,(float-vector 5600 6650 51.6065)
+			:name "/eng2/7f/room73B2-fetch-dock2-front")
+	 `(:rot ,(rpy-matrix pi/2 0 0)
+                        :pos ,(float-vector 2753 7698 51.6065)
+			:name "/eng2/7f/room73B2-fetch-dock-entrance")