this is a commit for sergi, do it for roger in the cris pc :D
Merge branch 'master' of https://github.com/reem-utils/robocup2014 into cris_branch
Merge pull request #379 from reem-utils/cris_branch

Cris branch