Add pick in cocktail
Fix some errors
Updating bash script for usb
Minor updates
Merge branch 'master' of https://github.com/reem-utils/robocup2014 into cris_branch
Merge pull request #326 from reem-utils/fix_sergi

added some time management functionalities. Now if we aint finished in 4...
Merge branch 'master' of https://github.com/reem-utils/robocup2014 into cris_branch
Merge pull request #327 from reem-utils/fix_sergi

bla
Merge branch 'master' of https://github.com/reem-utils/robocup2014 into cris_branch
Modified some things for cocktail party
Merge pull request #328 from reem-utils/fix_sergi

bla
Minor updates
Merge branch 'master' of https://github.com/reem-utils/robocup2014 into cris_branch
Merge pull request #329 from reem-utils/fix_sergi

Fix sergi
Merge pull request #330 from reem-utils/fix_sergi

some minor modifications to the grammars
added time in every test
Merge branch 'cris_branch' of https://github.com/reem-utils/robocup2014 into cris_branch
Merge branch 'cris_branch' of https://github.com/reem-utils/robocup2014 into cris_branch
Merge pull request #331 from reem-utils/fix_sergi

Fix sergi
Update of basic functionalities