bla
Merge pull request #328 from reem-utils/fix_sergi

bla
Merge branch 'master' of https://github.com/reem-utils/robocup2014 into cris_branch
Merge branch 'cris_branch' of https://github.com/reem-utils/robocup2014 into cris_branch
Update of basic functionalities