NEW: Merged in master with fightingteam
NEW: Fixed merge conflicts