Squashed commit of the following:

commit da2a3742541dcae44a7ada29d2bea5ff5acdd902
Merge: a809faf e105ff2
Author: FPtje <fpeijnenburg@gmail.com>
Date:   Fri May 3 18:44:27 2013 +0200

    Merge branch 'master' into darkrpFPP

    Conflicts:
    	server/FPP_Settings.lua

commit e105ff222b90289dbc6e30b0525979d0bea32469
Author: FPtje <fpeijnenburg@gmail.com>
Date:   Fri May 3 18:43:26 2013 +0200

    Fixed weird error

commit a809faf5adf38a605c8b2722c3721d20dd1c0073
Merge: 5562aaf a4f2f10
Author: FPtje <fpeijnenburg@gmail.com>
Date:   Sun Apr 28 15:24:27 2013 +0200

    Merge branch 'master' into darkrpFPP

    Conflicts:
    	lua/FPP_MySQLCore.lua
    	server/FPP_Settings.lua

commit a4f2f107cd3c9421f7922c0aef9f6cf97d44680a
Author: FPtje <fpeijnenburg@gmail.com>
Date:   Sun Apr 28 15:19:15 2013 +0200

    Fixed nondeterminism in MySQL queries

commit 5562aaf24012dd2a2d9c3bc7ceeeb31aae883b2d
Author: FPtje <fpeijnenburg@gmail.com>
Date:   Sat Apr 20 15:00:46 2013 +0200

    Conflicts:
    	server/FPP_Settings.lua

commit 65b31be084025249ccc7f9e7511a2273d40e8498
Merge: a7104ae 4025413
Author: FPtje <fpeijnenburg@gmail.com>
Date:   Sat Apr 20 14:58:17 2013 +0200

    Merge branch 'master' of github.com:FPtje/Falcos-Prop-protection

commit a7104ae5a4d4f30db0ecfcce9134a387397d9fc6
Author: FPtje <fpeijnenburg@gmail.com>
Date:   Sat Apr 20 14:57:52 2013 +0200

    Fixed https://github.com/FPtje/DarkRP/issues/528

commit 484d40a17546ee0207492640861f23b23c16a28b
Author: FPtje <fpeijnenburg@gmail.com>
Date:   Sat Apr 13 21:46:42 2013 +0200

    merge

commit 402541371932a786b24b87e7db15ef5e5333121e
Author: FPtje <fpeijnenburg@gmail.com>
Date:   Sat Apr 13 21:43:11 2013 +0200

    Fixed https://github.com/FPtje/DarkRP/issues/503

commit 6d64de9a2895bbfbd01a4de871375c7d1c3f7e04
Merge: 6ec5bbd cb9ccb8
Author: FPtje <fpeijnenburg@gmail.com>
Date:   Mon Apr 8 19:33:09 2013 +0200

    Merge branch 'master' of github.com:FPtje/Falcos-Prop-protection

commit bec381e3046471fd8aa83cef4596c7004b95b237
Merge: cdde134 e56fe31
Author: FPtje <fpeijnenburg@gmail.com>
Date:   Mon Apr 8 19:32:32 2013 +0200

    Merge branch 'darkrpFPP' of github.com:FPtje/Falcos-Prop-protection into darkrpFPP

commit cdde13476e9b5b3d6dff23d04e8ecd1f55891618
Author: FPtje <fpeijnenburg@gmail.com>
Date:   Mon Apr 8 19:32:02 2013 +0200

    Squashed commit of the following:

    commit 6ec5bbdfc935b4ec0eca60a1c08ace02db62952d
    Author: FPtje <fpeijnenburg@gmail.com>
    Date:   Mon Apr 8 19:29:20 2013 +0200

        Fixed #21

commit 6ec5bbdfc935b4ec0eca60a1c08ace02db62952d
Author: FPtje <fpeijnenburg@gmail.com>
Date:   Mon Apr 8 19:29:20 2013 +0200

    Fixed #21