Merge proposals dependent on lp://staging/~diegosarmentero/ubuntuone-control-panel/socket-communication

1. socket-communication
2. Dependent merge proposals