add image
fix conflict
ui success
Merge branch 'dev4' into ui
games list
fix conflict
merge ui