bug fixes after merge (still need to fix...

stll need to fix the bug that we found in the IDC:
When a player start playing and pressing the "back" button, he's button
says "your turn" and then the game is ended once he played is turn (the
other player doesn't have a chance to play)