fixe null exception
Merge branch 'master' of https://github.com/navyon/citytalk