Display the right image on the viewer
Merge branch 'develop' of github.com:buttleofx/ButtleOFX into develop