Merge pull request #49 in SWDEV/franka_ros from update-dependency to kinetic-devel

* commit '18361d49':
  franka_visualization: Fix path to RViz config file
  Fix dependencies on libfranka
  Integrate franka_description as subdirectory

.gitmodules

-[submodule "franka_description"]
-	path = franka_description
-	url = https://github.com/frankaemika/franka_description.git

CHANGELOG.md

 # CHANGELOG
 
+## 0.1.1 - UNRELEASED
+
+  * Integrate `franka_description` as subdirectory
+  * Fix dependencies on libfranka
+  * Fix RViz config file path in `franka_visualization`
+
 ## 0.1.0 - 2017-09-15
 
   * Initial release

franka_control/package.xml

 <?xml version="1.0"?>
 <package format="2">
   <name>franka_control</name>
-  <version>0.1.0</version>
+  <version>0.1.1</version>
   <description>franka_control provides a hardware node to control a Franka Emika research robot</description>
   <maintainer email="info@franka.de">Franka Emika GmbH</maintainer>
   <license>Apache 2.0</license>
@@ -15,7 +15,7 @@
 
   <build_depend>message_generation</build_depend>
 
-  <depend>Franka</depend>
+  <depend>libfranka</depend>
   <depend>actionlib</depend>
   <depend>actionlib_msgs</depend>
   <depend>controller_interface</depend>

franka_description @ 37b05181

-Subproject commit 37b05181deb2d27a8ebcfee1e0d4a6871902682e

franka_description/CMakeLists.txt

+cmake_minimum_required(VERSION 2.8.3)
+project(franka_description)
+
+find_package(catkin REQUIRED)
+catkin_package(CATKIN_DEPENDS xacro)

franka_description/mainpage.dox

+/**
+ * @mainpage
+ * @htmlinclude "manifest.html"
+ *
+ * Overview page for Franka Emika research robots: https://frankaemika.github.io
+ */