back button shifted to left side
conflicts resolved
Merge branch 'master' of https://github.com/AsheeshR/skin.flux
attempted to solve seekbar problem when not in the playing window
attempted to solve seekbar problem when not in the playing window