Merge branch 'ting/game_page'
fixed conflicts and pics
more conflicts
fixing non-action cards display
Merge branch 'master' into ting/game_page
hover on nonaction cards display bigger versions