1.07/2.0.0 merge

powerlord/sourcemod-freak-fortress-2@4606228fb2c278010c3a757c1347e543aff04fc0

powerlord/sourcemod-freak-fortress-2@c90e9e3de8bff8d1bba8800f62e087c6d7599a0b

powerlord/sourcemod-freak-fortress-2@507a5d642fd38d426957b191012589bf74024763

powerlord/sourcemod-freak-fortress-2@48f8255a0581b38189301b9fb82c1f88de23d9d7