maerge
Merge branch 'master' of github.com:peterlindkvist/allplay
Merge branch 'master' of github.com:peterlindkvist/allplay
BasicPlayer
Merge branch 'master' of github.com:peterlindkvist/allplay
BasicPlayer
merge