Add "Waiting..." message to Twitch emote content tab
Merge remote-tracking branch 'origin/master' into gh-pages