Fixed js
Merge choupom ...
Merge branch 'master' of https://github.com/TeeFun/TeeFun