Merge branch 'dev' into 'master'

backend/api/tournament.js

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

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

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

...nd/core/src/com/gameware/game/states/BubbleWrapState.java

...end/core/src/com/gameware/game/states/ColorRushState.java

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

...rc/com/gameware/game/states/CreateNewTournamentState.java

...src/com/gameware/game/states/FinishedTournamentState.java

...d/core/src/com/gameware/game/states/FruitSlicerState.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/MenuStateTemplate.java

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

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

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

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

...com/gameware/game/states/SinglePlayerSelectGameState.java

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

...rc/com/gameware/game/states/TournamentHighScoreState.java