Squashed commit of the following:

commit f22b5cf1394e6217dc4e59b748fb5a2210c0ebec
Merge: fb65a1a f0c8b15
Author: FPtje <fpeijnenburg@gmail.com>
Date:   Thu Jul 25 10:00:19 2013 +0200

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

commit fb65a1a752e18f96a6823253948fcf1b50f822b9
Merge: f5fe877 78b4ae8
Author: FPtje <fpeijnenburg@gmail.com>
Date:   Thu Jul 25 10:00:01 2013 +0200

    Merge branch 'master' into darkrpFPP

commit 78b4ae879ce7feeb3dfa124608a0fa15b6d24fbf
Author: FPtje <fpeijnenburg@gmail.com>
Date:   Thu Jul 25 09:59:22 2013 +0200

    Fixed error with scars
More reliable arrest SetPos, references #405
Merge branch 'master' of github.com:FPtje/DarkRP