#106 - unified video player
Merge branch 'master' of github.com:boonex/dolphin