Merge branch 'master' of https://github.com/icplayer/icplayer.git
Merge branch 'master' of https://github.com/icplayer/icplayer.git