Merge branches

[GiuliaP]

This issue is to remind us to merge the two branches we have at present, updating the master with the nvidia one. I can do it as soon as I can.

The demo should be as much as possible platform independent, in particular separating the tracking of the target object from the state machine and visual recognition part.

Also, we should update the ROBOT_MODE behavior ( @tanismar did you work on this recently?).

[GiuliaP]

Partially addressed by last commits (we removed nvidia branch and rebased master).

Now the master branch runs on R1 in HUMAN_MODE and we have to do the following:

• merge (or more generally, import) @tanismar 's fork in our demo-icub branch in order to upgrade the iCub's demo in ROBOT_MODE
• upgrade the iCub's demo in HUMAN_MODE (always demo-icub branch)
• eventually implement the ROBOT_MODE on R1

Finally, we would have the same demo running on iCub or R1 in the two modalities.

@pattacini @vtikha @tanismar