Merge pull request #23 from ChrisBoesch/master

update
debug for IOS 6 video pop up #1
Merge pull request #254 from LI-HE/master

debug for IOS 6 video pop up #1
Merge pull request #255 from ruijunhuang2010/master

Merge pull request #23 from ChrisBoesch/master
Merge pull request #24 from ChrisBoesch/master

update
Merge pull request #256 from ruijunhuang2010/master

Merge pull request #24 from ChrisBoesch/master
Test Pull Request
Merge pull request #257 from jownsftw/master

Test Pull Request
Merge pull request #86 from ChrisBoesch/master

Updates