icon calibration
Merge branch 'master' of http://github.com/jayhack/SoftStroke

Conflicts:
	StoppableThread.pyc
	controller.pyc
	displayThread.pyc
	gravityThread.pyc
	icon.pyc
	util.pyc