Merge https://github.com/yourcelf/btb

Conflicts:
	scanblog/templates/about/faq.html