Merge branch 'develop' of https://github.com/ARISGames/server
Merge branch 'master' of https://github.com/ARISGames/server
Merge remote-tracking branch 'origin/develop'
Merge branch 'master' of https://github.com/ARISGames/server
Merge branch 'master' of https://github.com/ARISGames/server
Merge branch 'master' of https://github.com/ARISGames/server
Merge branch 'master' of https://github.com/ARISGames/server
Removed 'all time' from stats page. Updated logo and colors
Merge branch 'master' into develop