make threading optional
Merge branch 'master' into threads
Merge branch 'master' into threads

Conflicts:
	threader/threader.js
add thread color for new discussion
added icon for threader settings
added test for starting of a thread
Merge branch 'master' into threads
add color number only if threader is disabled for room
ignore thread.title from java process
Merge pull request #359 from scrollback/threads

Threader