hopefully fixes player select with controllers
Merge branch 'master' of github.com:meredrica/agj2014