Merged with master.
Added game_end screen
and dialog window (work in progress).