Merge pull request #126 from CarlRapp/TENFIRE

Tenfire
Updated Screens with better input management
Updated SoundManager to work with options
Updated to work with new SoundManager
Settings added
Merge branch 'master' of https://github.com/CarlRapp/CodenameGamma
Updated a fix
Merge pull request #127 from CarlRapp/master

Update