Added more labels to the forms
Merge branch 'master' into dev

Conflicts:
	threads/templates/view_thread.html