Update jokes.txt
Merge pull request #128 from w1lla/patch-1

Update jokes.txt
fix for server rank display
Merge branch 'master' into nighty

Conflicts:
	LocalRecords/Gui/Controls/RankItem.php
Merge branch 'nighty' into dev