navigation menu
wearable integration
Merge pull request #5 from hoyuela/dev

navigation menu
Weight sensor service
Merge branch 'master' of https://github.com/dannycohn/Sitter-Android

# By Solstice Loaner #13
# Via Danny Cohn (1) and others
* 'master' of https://github.com/dannycohn/Sitter-Android:
  navigation menu wearable integration
Merge pull request #6 from SolsticeConsulting/master

Weight sensor service
Merge branch 'master' of https://github.com/dannycohn/Sitter-Android

* 'master' of https://github.com/dannycohn/Sitter-Android:
no message
no message
Merge pull request #7 from hoyuela/dev

Dev
no message
Merge pull request #8 from hoyuela/dev

no message
Sensor service
Merge pull request #9 from SolsticeConsulting/master

Sensor service
assdsfs
Merge pull request #10 from SolsticeConsulting/master

assdsfs
Merge branch 'master' of https://github.com/dannycohn/Sitter-Android

Conflicts:
	Sitter/AndroidManifest.xml
	Sitter/res/layout/activity_main.xml

committing