Merge branch 'development'
updated display image
Merge branch 'master' into development