After CBR2014
GMerge remote-tracking branch 'upstream/master'

Conflicts:
	robotino_mapping/include/RobotinoMapping.h
	robotino_mapping/include/RobotinoMapping.h~
	robotino_mapping/src/RobotinoMapping.cpp
	robotino_mapping/src/RobotinoMapping.cpp~
	robotino_motion/CMakeLists.txt
	robotino_motion/CMakeLists.txt~
	robotino_motion/include/RobotinoMotionClient.h
	robotino_motion/include/astar.h
	robotino_motion/src/RobotinoMotionClient.cpp
	robotino_motion/src/RobotinoMotionServer.cpp
	robotino_motion/src/astar.cpp
	robotino_planner/CMakeLists.txt~
	robotino_planner/include/RobotinoPlannerClient.h
	robotino_planner/include/RobotinoPlannerClient.h~
	robotino_planner/include/RobotinoPlannerServer.h
	robotino_planner/src/RobotinoPlannerClient.cpp
	robotino_planner/src/RobotinoPlannerClient.cpp~
	robotino_planner/src/RobotinoPlannerServer.cpp
	robotino_planner/src/RobotinoPlannerServer.cpp~
	robotino_vision/CMakeLists.txt
	robotino_vision/CMakeLists.txt~
	robotino_vision/include/RobotinoVision.h
	robotino_vision/include/RobotinoVision.h~
	robotino_vision/launch/robotino_vision.launch
	robotino_vision/launch/robotino_vision.launch~
	robotino_vision/src/RobotinoVision.cpp
	robotino_vision/src/RobotinoVision.cpp~
	robotino_vision/srv/FindObjects.srv
	robotino_vision/srv/FindObjects.srv~
Version after CBR2014
Merge pull request #5 from adrianohrl/master

After CBR2014