merging from stash
interim commit to thread options
topic locking and deletion
Merge remote-tracking branch 'origin' into thread_options

Conflicts:
	public/src/templates.js
Merge remote-tracking branch 'origin' into thread_options
added some styling and elements to thread deletion

Conflicts:
	public/src/ajaxify.js
fixing socket returns to emit to everybody in the room (on thread locking/deletion)
Merge remote-tracking branch 'origin' into thread_options
restricting upvoting if a thread is locked
removing topic from listing if deleted, and adding lock icon if thread is locked