Merge pull request #125 from CarlRapp/master

Update
Changed Sun
added deathtime for tank and ghost
Merge pull request #126 from CarlRapp/TENFIRE

Tenfire