add treshhold detect
Merge branch 'master' of github.com:caadachi/hensinWear

Conflicts:
	wear/src/main/java/com/example/sgspecial/myapplication/MyActivity.java
	wear/src/main/java/com/example/sgspecial/myapplication/SensorModel.java
Merge branch 'master' of github.com:caadachi/hensinWear

Conflicts:
	wear/src/main/java/com/example/sgspecial/myapplication/MyActivity.java
Merge branch 'master' of github.com:caadachi/hensinWear

Conflicts:
	wear/src/main/java/com/example/sgspecial/myapplication/MyActivity.java