Squashed commit of the following:

commit 03961c817d026aec24fc1dc79ad83be500d9b352
Merge: a4b2158 7eb043c
Author: FPtje <fpeijnenburg@gmail.com>
Date:   Sun Jun 16 19:48:20 2013 +0200

    Merge branch 'master' into darkrpFPP

commit 7eb043c1a623b60981c6fb9ae34862a8517c2060
Author: FPtje <fpeijnenburg@gmail.com>
Date:   Sun Jun 16 19:48:03 2013 +0200

    Network optimization in FPP show owner
Conflicts:
	gamemode/fpp/client/FPP_HUD.lua