Merge branch 'master' into mauricio
Comment out AP check
Serialize bug
Merge branch 'master' into mauricio

Conflicts:
	src/controllers/GameManager.java
	src/models/Game.java
	src/models/Player.java
Merge branch 'mauricio'
set GamePanel
Merge branch 'master' into mauricio
Merge branch 'mauricio'