Add question image showing
Merge branch 'showing-image' into development
Resolve conflicts