Twenty Fourteen: merge Front Page Sidebar and Content Sidebar. Props iamtakashi, see #25565; closes #25565.
Built from https://develop.svn.wordpress.org/trunk@25762


git-svn-id: http://core.svn.wordpress.org/trunk@25675 1a063a9b-81f0-0310-95a4-ce76da25c4cd