Merge Find_people_in_room and Find_person_in_room

[PetervDooren]

trafficstars

We currently have two smach states dedicated to finding people.

find_person_in_room.py: which uses faces and ed entities. Find_people_in_room.py: which uses the people detector.

Merging these two files will break a lot of things in the action server and smach states.