Added by Sofia Papagiannaki about 12 years ago
Merge branch 'cloudbar', remote-tracking branch 'origin'