Merge branch 'master' of https://github.com/m128/afan

Conflicts:
	app/model/Robot.java
	app/ru/afan/YaMain.java