merge recent changes to tweetbubble copy
Merge branch 'merge_to_tweetbuble'