Twitter avatar now depends on server type
Merge remote-tracking branch 'origin/dev'