Fixed bug where time wasn't updating
Merge branch 'BR80-RemergeGameCode'