some uncommited changes
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
fixing file again
Merge branch 'master' of https://github.com/reem-utils/robocup2014