Generic refactoring
Merge branch 'master' of https://github.com/dsinn/AlienSwarmLeaderboards