Merge branch 'master' of ssh://vontaene/home/erik_alt/git/ros_wild_thumper

diff --cc www/assets/javascripts/application.js
Simple merge

diff --cc www/index.html
index 253c35d4cef259fa2440a2eabeb3d57d16187898,bc209acf04c5a79eb1bc7c5f96d68b0bff7db3a9..db7e48d8b2adcea71f0090abeeabbac4aa82a76a
--- 1/www/index.html
--- 2/www/index.html
+++ b/www/index.html
@@@ -112,18 -115,10 +115,18 @@@
                                        </div>
                                </div>
                                <div id="drive" class="tab-pane" role="tabpanel">
 -                                      <div class="cmd_vel_circle"></div>
 +                                      <div class="row">
 +                                              <div class="col-sd-10">
 +                                                      <div class="cmd_vel_circle"></div>
 +                                              </div>
 +                                              <div class="col-sd-1">
 +                                                      <input type="number" value="1.0" min="0.1" max="5.0" step="0.1" class="form-control" id="scale_trans">
 +                                                      <input type="number" value="3.0" min="1.0" max="5.0" step="0.1" class="form-control" id="scale_rot">
 +                                              </div>
 +                                      </div>
                                </div>
                                <div id="image" class="tab-pane" role="tabpanel">
-                                       <img id="usb_cam" src="http://wildthumper:8080/stream?topic=/usb_cam/image_raw" style="transform:rotate(-90deg); transform-origin: 60% 60%;"></img>
+                                       <img id="usb_cam" src="http://"+robothostname+":8080/stream?topic=/usb_cam/image_raw" style="transform:rotate(-90deg); transform-origin: 60% 60%;"></img>
                                </div>
                        </div>
                </div>