- comment
Merge remote-tracking branch 'origin/master'

Conflicts:
	accelerometer-sandbox/src/co/joyatwork/pedometer/StepDetector.java