Changes how handles facebook avatar
Merge remote-tracking branch 'origin/dev'