Merge branch 'competitions'
Merge branch 'master' of github.com:einkelflugle/robocraft-rails