Merge pull request #60 from reem-utils/sergi_branch

Sergi branch
Merge branch 'master' of http://github.com/reem-utils/robocup2014 into sergi_branch
preparation for gpsr stage