Added getStateId() to all game states
Merged