Master -> BEF

Cannot be done on github because of two small conflicts in robocode.