Fixes after rebase
Merge branch 'dev' of https://github.com/krukon/paper_soccer into dev