Added HTTP proxy support
Sort friends alphabetically and order them by status
Merge remote-tracking branch 'origin/master' into video