update sensor parameter
Merge branch 'master' into refactor_1

Conflicts:
	app/src/main/java/com/example/yaginuma/jinjyamap/MainActivity.java