Squashed commit of the following:

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

    Conflicts:
    	server/FPP_Settings.lua

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

    merge

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