Merge branch 'master' of https://github.com/savetheinternet/Tinyboard

Conflicts:
	inc/config.php
	inc/display.php
	inc/mod/pages.php
	js/catalog-link.js
	post.php
	templates/banned.html

templates/banned.html

@@ -77,8 +77,8 @@
 	</p>
 	<p>{% trans %}Your IP address is{% endtrans %} <strong>{{ ban.ip }}</strong>.</p>
 
-	{% if config.ban_page_message %}
-		<p>{{ config.ban_page_message }}</p>
+	{% if config.ban_page_extra %}
+		<p>{{ config.ban_page_extra }}</p>
 	{% endif %}
 </div>
 {% endfilter %}