Add Bambuser and Ustream
Merge