renamed:    srs_assisted_detection/ros/src/action_fake_user.py -> srs_assisted_detection/ros/src/fake_action_user.py
	renamed:    srs_assisted_detection/ros/src/bb_fake_user.py -> srs_assisted_detection/ros/src/fake_bb_user.py
	renamed:    srs_assisted_detection/ros/src/ui_detection_fake_user.py -> srs_assisted_detection/ros/src/fake_detection_user.py
	modified:   srs_states/src/assisted_detection_states.py
DetectPeople service added
	modified:   srs_assisted_detection/ros/src/fake_detection_user.py
	modified:   srs_states/manifest.xml
	modified:   srs_states/src/assisted_detection_states.py
new service update
new service update
Merge remote-tracking branch 'beisheng/master'
	modified:   srs_assisted_detection/manifest.xml
	modified:   srs_assisted_detection/ros/src/fake_bb_user.py
	modified:   srs_assisted_detection/ros/src/ui_bbmove.py
	modified:   srs_states/manifest.xml
	modified:   srs_states/src/assisted_detection_states.py
	modified:   srs_symbolic_grounding/nodes/scan_base_pose_server.py
compare human detection service added
Merge branch 'master' of https://github.com/renxi-cu/srs_public
services
Merge branch 'service'
service2
Merge remote-tracking branch 'alex/master'
pause to DM removed
human sensing service changed
fake detectLegs service
bb_move update
	new file:   srs_arm_navigation_tests/launch/env_model.launch
	new file:   srs_arm_navigation_tests/launch/fake_dm_test_rob.launch
	new file:   srs_arm_navigation_tests/launch/rviz.launch
	modified:   srs_arm_navigation_tests/src/fake_dm.py
	new file:   srs_assisted_arm_navigation/launch/but_arm_nav_rob.launch
	modified:   srs_assisted_arm_navigation/launch/but_arm_nav_with_dm.launch
	modified:   srs_assisted_arm_navigation/launch/planning_env_but.launch
	modified:   srs_assisted_detection/ros/src/ui_detection.py
	modified:   srs_decision_making/ros/launch/srs_decision_making.launch
	modified:   srs_decision_making/src/ipa_examples_mod.py
	modified:   srs_decision_making/src/robot_configuration.py
	modified:   srs_decision_making/src/srs_actions_server.py
	modified:   srs_decision_making/src/srs_common_high_level_statemachines.py
	modified:   srs_decision_making/src/srs_configuration_statemachines.py
	modified:   srs_decision_making/src/test_client_get_milk.py
	modified:   srs_decision_making/src/test_client_move_order.py
	modified:   srs_environments/param/dm_common.yaml
	modified:   srs_environments/param/dm_simple_english.yaml
	modified:   srs_environments/param/dm_simple_with_enviroment_update_english.yaml
	modified:   srs_grasping/launch/grasping_services.launch
	modified:   srs_grasping/manifest.xml
	modified:   srs_grasping/scripts/generator.py
	modified:   srs_grasping/scripts/grasp_test.py
	modified:   srs_grasping/scripts/simulation.py
	modified:   srs_grasping/src/get_grasps_from_position.py
	modified:   srs_grasping/src/get_grasps_from_position_as.py
	modified:   srs_grasping/src/grasping_functions.py
	new file:   srs_human_sensing/CMakeLists.txt
	new file:   srs_human_sensing/Makefile
	new file:   srs_human_sensing/mainpage.dox
	new file:   srs_human_sensing/manifest.xml
	new file:   srs_human_sensing/src/srs_human_sensing/hs.py
	new file:   srs_human_sensing/srv/Comp_HS_Detections.srv
	modified:   srs_knowledge/CMakeLists.txt
	new file:   srs_knowledge/conf/ontologies/srs-milano2012-it/srs-milano2012-it.owl.in
	modified:   srs_knowledge/conf/ontologies/srs-milano2012/srs-milano2012.owl.in
	modified:   srs_knowledge/conf/ontologies/srs.owl
	copied:     srs_knowledge/conf/srs-milano2012.cfg -> srs_knowledge/conf/srs-milano2012-it.cfg.in
	renamed:    srs_knowledge/conf/srs-milano2012.cfg -> srs_knowledge/conf/srs-milano2012.cfg.in
	modified:   srs_knowledge/conf/srsknow.cfg.in
	modified:   srs_leg_detector/CMakeLists.txt
	modified:   srs_leg_detector/manifest.xml
	modified:   srs_leg_detector/src/srs_leg_detector.cpp
        new file:   srs_leg_detector/srv/DetectLegs.srv
	modified:   srs_object_verification/src/eval_objects.py
	modified:   srs_states/scripts/test_mapping_states.py
	new file:   srs_states/scripts/test_object_verification.py
	modified:   srs_states/src/detection_states.py
	modified:   srs_states/src/mapping_states.py
	modified:   srs_states/src/navigation_states.py
	modified:   srs_states/src/srs_grasp_states.py
	modified:   srs_symbolic_grounding/nodes/symbol_grounding_scan_base_pose_client.py
	new file:   srs_human_sensing/ros/src/fake_people_detection.py
	new file:   srs_human_sensing/ros/src/human_sensing_states.py
	new file:   srs_human_sensing/ros/src/sm_human_sensing.py
	new file:   srs_human_sensing/ros/src/sm_human_test.py
	modified:   srs_environments/param/dm_simple_english.yaml
	modified:   srs_states/src/assisted_detection_states.py