some uncommited changes
Some bugs fixed in gpsr stage during test
Merge pull request #340 from reem-utils/cris_branch

Cris branch
Fixed a bit grammars.
drinks had a typo. CreatePois also. Iam had only garbage1, now is garbage2
Merge branch 'master' of https://github.com/reem-utils/robocup2014
fixed a bug where after each action the robot whent to the referee
Merge pull request #341 from reem-utils/fix_sergi

fixed a bug where after each action the robot whent to the referee
Merge branch 'cris_branch' of https://github.com/reem-utils/robocup2014 into cris_branch

Conflicts:
	stage_2/gpsrSoar/real/gpsrSoar/SOAR/gp2/initialize-gp.soar
Merge branch 'master' of https://github.com/reem-utils/robocup2014 into cris_branch