modification
Merge branch 'master' of https://github.com/reem-utils/robocup2014 into sergi_branch
Merge pull request #368 from reem-utils/cris_branch

Changes in robot inspection for robocup
modified the distance for place, now we have it in a robocup_params.yaml
Merge pull request #369 from reem-utils/sergi_branch

Sergi branch
some stuff i aint in a mod to explain coz i cant even remember
Merge pull request #370 from reem-utils/sergi_branch

some stuff i aint in a mod to explain coz i cant even remember
preparation for test
Merge pull request #371 from reem-utils/sergi_branch

preparation for test
fixet a bugg in placing objects in gpsr
Merge pull request #372 from reem-utils/sergi_branch

fixet a bugg in placing objects in gpsr
Merge pull request #373 from reem-utils/cris_branch

Cris branch
en teoria estan els pois actualitzats
Merge branch 'master' of https://github.com/reem-utils/robocup2014 into roger_branch
Merge pull request #374 from reem-utils/roger_branch

Roger branch
Changes for the comptetion v1
Merge pull request #375 from reem-utils/chang_branch

Changes for the comptetion v1
Grammar for emergency new
Merge pull request #376 from reem-utils/chang_branch

Grammar for emergency new
Updates emergency