[TestPedometer]　簡単な歩数計を作成
Merge remote-tracking branch 'origin/master'

Conflicts:
	TestPedometer/bin/TestPedometer.apk