Add JBoxPlayer
Fixed merge conflicts