Formatting stuff, it wasn't as bad this time, I think he's learning :D
Merge branch 'master' of https://github.com/PolarisTeam/PolarisServer