Merge branch 'controller'
serializing and loading gameModel
Action IDs increment now
Game state initialization
Merge branch 'master' into controller
Merge branch 'controller' into mauricio
Merge branch 'mauricio' into controller