fix a few issues
Merge branch 'master' of https://github.com/wayne8798/bilingual-fbapp