Custom Name and Custom Channel Badge: syp2012
Merge remote-tracking branch 'origin/master' into gh-pages