Ready for Custom Channel Badge
Fix backup of window.escape
Merge remote-tracking branch 'origin/master' into gh-pages