refactor the avatar code in contact factory class
 Merge branch 'master' of https://github.com/76260865/TextSecure