Huge update
Merge branch 'master' of https://github.com/XcyTheR101/Sportal