Mainly a checkin to merge two slightly different versions of the thread
viewer
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/edu/cmu/cs/in/controls/HoopThreadView.java