Fixed a gamestate bug.
Merge branch 'development' into soundTweaks
Merged development with soundTweaks.