Some bugs and changes
Merge branch 'master' of https://github.com/Deo92/FUF_League.git