started json usage client-side
Merge branch 'master' of git@github.com:TeeFun/TeeFun.git