fix bug
Merge branch 'master' of https://github.com/autobanana/SecretTalk.git into vicky_20140710