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

Conflicts:
	templates/thread.html

templates/page.html

@@ -22,4 +22,4 @@
 		<p class="unimportant" style="margin-top:20px;text-align:center;">Powered by <a href="http://tinyboard.org/">Tinyboard</a> {{ config.version }} | <a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2013 Tinyboard Development Group</p>
 	</footer>
 </body>
-</html>
+</html>

templates/thread.html

@@ -23,12 +23,13 @@
 			{% if mod %}<p><a href="?/">{% trans %}Return to dashboard{% endtrans %}</a></p>{% endif %}
 		</div>
 	</header>
-	
+
 	<div class="banner">{% trans %}Posting mode: Reply{% endtrans %} <a class="unimportant" href="{{ return }}">[{% trans %}Return{% endtrans %}]</a></div>
 
 	{% include 'attention_bar.html' %}	
+
 	{% include 'post_form.html' %}
-	
+
 	{% if config.blotter %}<hr /><div class="blotter">{{ config.blotter }}</div>{% endif %}
 	<hr />
 	<form name="postcontrols" action="{{ config.post_url }}" method="post">