Merge branch 'chang_branch' of https://github.com/reem-utils/robocup2014 into cris_branch
face_recognition_fake beta
Merge branch 'master' of https://github.com/reem-utils/robocup2014 into roger_branch
Last version of enter room. It asks for open the door and do home position after go to the poi
face fake recognition beta
Merge pull request #28 from reem-utils/roger_branch

Roger branch fake face
fake face service
Merge pull request #30 from reem-utils/cris_branch

Cris branch
face enrollment state_machine alpha
Merge branch 'master' of https://github.com/reem-utils/robocup2014 into roger_branch
learning face state
Merge pull request #31 from reem-utils/roger_branch

Roger branch
Merge branch 'master' of https://github.com/reem-utils/robocup2014 into chang_branch
Merge pull request #29 from reem-utils/chang_branch

Beta version of 'manip_to_pose'
face_recognition_fake whith database
Merge pull request #32 from reem-utils/roger_branch

face_recognition_fake whith database
update of fake_face_recognition and drop_state
Merge pull request #33 from reem-utils/roger_branch

update of fake_face_recognition and drop_state
Merge branch 'master' of https://github.com/reem-utils/robocup2014 into chang_branch
Adding alpha version of manip_to_joint.py SM