Merge pull request #83 from FelixOnline/third_party

Third party
Merge branch 'media_player' of https://github.com/entrepreneurj/FelixOnline into entrepreneurj-media_player