refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/robots/JRuleRobot.java
refactoring