Copy over some files that didn't get merged properly

components/contents.php

components/library.php

components/mw.php

components/pagemap.php

components/pastebin.php

components/static.php

database.sql

htdocs/images/shame.php

static/Community/Planet.txt

templates/contents-loop.tpl

templates/foot.cy.tpl

templates/foot.tpl

templates/front.tpl

templates/news_edit.tpl

templates/pastebin.tpl