Merge branch 'master' of https://github.com/nbellowe/clam into HEAD

Conflicts:
	clam_moveit_config/CMakeLists.txt
	clam_moveit_config/config/joint_limits.yaml
	clam_moveit_config/launch/fake_moveit_controller_manager.launch
	clam_moveit_config/launch/moveit.rviz
	clam_moveit_config/launch/moveit_rviz.launch
	clam_moveit_config/launch/planning_context.launch
	clam_moveit_config/launch/setup_assistant.launch
	clam_moveit_config/launch/trajectory_execution.launch
	clam_moveit_config/launch/warehouse.launch