Merge remote-tracking branch 'upstream/master'

Conflicts:
	GameEngine/Ranking.php
fix getARanking
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into develop