#32 Resolved merge conflicts with dev.

frontend/core/src/com/gameware/game/GameWare.java

frontend/core/src/com/gameware/game/models/Game.java

frontend/core/src/com/gameware/game/models/Highscore.java

frontend/core/src/com/gameware/game/models/Player.java

frontend/core/src/com/gameware/game/models/Round.java

frontend/core/src/com/gameware/game/models/Tournament.java

...c/com/gameware/game/states/CreateJoinTournamentState.java

...d/core/src/com/gameware/game/states/GameStateManager.java

frontend/core/src/com/gameware/game/states/LoginState.java

frontend/core/src/com/gameware/game/states/MenuState.java

.../core/src/com/gameware/game/states/PlayStateTemplate.java

frontend/core/src/com/gameware/game/states/State.java

...core/src/com/gameware/game/states/ViewHighScoreState.java

...ore/src/com/gameware/game/states/ViewTournamentState.java