Merge branch 'master' into No_movement_mode

diff --combined naja/widgets/tile.py
index e559d956f57b943295746c239733f4fc1312680b,8b71d1fd016f0dca93d54aed89470209cc23ccd5..36b73d09ab81248933b51e1ef6142f76c6fc9ee6
--- 1/naja/widgets/tile.py
--- 2/naja/widgets/tile.py
+++ b/naja/widgets/tile.py
@@@ -2,7 -2,7 +2,7 @@@
  import pygame
  import pygame.locals as pgl
  
 -from naja.constants import TILE_SIZE, BITS, LOCK_HEIGHT, MOVE, EXAMINE
 +from naja.constants import TILE_SIZE, BITS, LOCK_HEIGHT, EXAMINE
  from naja.resources import resources
  from naja.resources.mutators import EIGHT_BIT
  from naja.widgets.base import Widget
@@@ -31,7 -31,7 +31,7 @@@ class TileWidget(Widget)
          # Draw background
          x, y = abs(self.board_pos[0] - 2), abs(self.board_pos[1] - 2)
          legal_move = (self.board_pos in self.state.player.legal_moves())
 -        if self.state.gameboard.player_mode in (MOVE, EXAMINE) and legal_move:
 +        if self.state.gameboard.player_mode == EXAMINE and legal_move:
              bg = resources.get_image('board/tile_available.png',
                                       transforms=(EIGHT_BIT,))
          elif (x + y) % 2 == 0:
@@@ -40,11 -40,14 +40,14 @@@
          else:
              bg = resources.get_image('board/tile_1.png',
                                       transforms=(EIGHT_BIT,))
+         overlay = None
          if self.highlighted:
-             bg = resources.get_image('board/tile_selected.png',
-                                      transforms=(EIGHT_BIT,))
+             overlay = resources.get_image('board/tile_selected.png',
+                                           transforms=(EIGHT_BIT,))
          self.surface = pygame.surface.Surface(TILE_SIZE)
          self.surface.blit(bg, (0, 0))
+         if overlay is not None:
+             self.surface.blit(overlay, (0, 0))
          # Look up the required bits on the board location
          card = self.state.board_locations[self.board_pos]
          player_pos = self.state.player.position