Make build on windows 7
Merge branch 'f-George'

Conflicts:
	src/MainRobot.java