fix charset and diamond clien dependecy
Merge branch 'master' of github.com:ferdiknight/tb_tddl