Merge branch 'dev' into 69-add-round-check-method-in-qi

backend/api/rounds.js

backend/api/tournament.js

frontend/android/assets/bg1_finTourn.jpg

frontend/android/assets/glassy/raw/dialog_holo_light.9.png

frontend/android/assets/glassy/skin/glassy-ui.atlas

frontend/android/assets/glassy/skin/glassy-ui.json

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

frontend/core/src/com/gameware/game/QueryIntermediate.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

frontend/core/src/com/gameware/game/sprites/Bubble.java

...d/core/src/com/gameware/game/sprites/ColorRushButton.java

...d/core/src/com/gameware/game/sprites/ColorRushTarget.java

...end/core/src/com/gameware/game/sprites/LoadingCircle.java

frontend/core/src/com/gameware/game/sprites/PauseButton.java

frontend/core/src/com/gameware/game/sprites/PauseCircle.java

frontend/core/src/com/gameware/game/sprites/Sprite.java

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

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