Giant import

Signed-off-by: David Silver <dms.silver@gmail.com>
Merge branch 'master' of https://github.com/Nuku/Flexible-Survival.git
Merge branch 'master' of https://github.com/TigerStripes/Flexible-Survival
Fixed to compile

Signed-off-by: David Silver <dms.silver@gmail.com>
Merge branch 'master' of https://github.com/Nuku/Flexible-Survival.git
fix