Changed "Scratch Forums" to "Discuss Scratch" in preparation for changing /forums/ to /discuss/ on scratchr2
Merge branch 'master' of https://github.com/LLK/s2forums

Conflicts:
	djangobb_forum/templates/djangobb_forum/index.html
	djangobb_forum/templates/djangobb_forum/lofi/add_topic.html
	djangobb_forum/templates/djangobb_forum/lofi/reply.html
	djangobb_forum/templates/djangobb_forum/mobile/forum.html
	djangobb_forum/templates/djangobb_forum/mobile/search_form.html
	djangobb_forum/templates/djangobb_forum/mobile/search_posts.html
	djangobb_forum/templates/djangobb_forum/mobile/search_topics.html
	djangobb_forum/templates/djangobb_forum/mobile/sign_in.html
	djangobb_forum/templates/djangobb_forum/mobile/topic.html