Merge branch 'hotfix/movieTriler'
fix firefox 18+ and login error
Merge branch 'hotfix/1.10.14' into develop