#32 Merge commit with dev.

backend/api/highscores.js

backend/api/tournament.js

backend/index.js

frontend/android/AndroidManifest.xml

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

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

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

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

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

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

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

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

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

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

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

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