Squashed commit of the following:

commit 6f8bf9098bd17bd2d26cbb077c5811bd45b4c561
Merge: 4b45097 946c3dc
Author: FPtje <fpeijnenburg@gmail.com>
Date:   Mon Jun 17 20:32:42 2013 +0200

    Merge branch 'master' into darkrpFPP

commit 946c3dc57e5beedae7c804cda2750851da7caa5f
Author: FPtje <fpeijnenburg@gmail.com>
Date:   Mon Jun 17 20:32:38 2013 +0200

    Small exploit update

commit 4b45097b8ed303f48a569a46863095a3c81452ab
Merge: 03961c8 e5aba37
Author: FPtje <fpeijnenburg@gmail.com>
Date:   Sun Jun 16 19:51:59 2013 +0200

    Merge branch 'master' into darkrpFPP

commit e5aba3703b323d81bf36bc60706eb1f39ead240d
Author: FPtje <fpeijnenburg@gmail.com>
Date:   Sun Jun 16 19:51:52 2013 +0200

    Small fix

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