Revert "Merge branch 'master' of https://github.com/maxanton/stk-code into OGL32OSX"

This reverts commit 7f72c7438da74e6394db2a86ec6fe349ab6d4eb5, reversing
changes made to c10f26ce8c74328d20238e3dceab88c49d953520.
Revert "Merge remote-tracking branch 'origin/master' into OGL32OSX"

This reverts commit c10f26ce8c74328d20238e3dceab88c49d953520, reversing
changes made to 9bee96e00e06ac15ef2286a0d352d370e98b512b.