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

Conflicts:
	arm.launch

diff --combined arm.launch
index d63bd6aa2480a9e1d6e0a693ec1129c6009f029f,9a353f2b52d33dee857e91f3b92f75c443bcefc3..b32d8be2703146f1b3085c0dd19ca9fa4dfc543e
--- 1/arm.launch
--- 2/arm.launch
+++ b/arm.launch
@@@ -1,10 -1,15 +1,10 @@@
  <?xml version="1.0"?>
  <launch>
-       <include file="$(find arm)/launch/openni2.launch" />
+       <include file="$(find openni2_launch)/launch/openni2.launch" />
  
        <node pkg="depthimage_to_laserscan" type="depthimage_to_laserscan" name="depthimage_to_laserscan" output="screen">
                <remap from="image" to="/camera/depth/image_raw"/>
                <remap from="camera_info" to="/camera/depth/camera_info"/>
                <param name="output_frame_id" value="/scan" />
        </node>
 -
 -      <!--
 -      <param name="robot_description" command="$(find xacro)/xacro.py $(find arm)/urdf/arm.urdf.xacro" />
 -      <node name="robot_state_publisher" pkg="robot_state_publisher" type="state_publisher" />
 --->
  </launch>