Fix Image Button bug + handle image media
Merge branch 'master' of https://github.com/Perfectro/MediaPlayer.git