Merge branch 'hotfix/UI_1.2.17'
Merge branch 'master' of github.com:manywho/ManyWho_HTML5_Players into develop
Merge branch 'develop' of github.com:manywho/ManyWho_HTML5_Players into develop