Threads should now stop.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/hanon/app/controller/EvaluationController.java
Clicker doesn't miss last beat of count in.