Database and game class changes. Branching is hard
Merge origin/master