merge with upstream
merge with local master
marge with upstream
Merge pull request #7 from eneim/master

Merge
Merge branch 'master' of https://github.com/GreenRobots/JPHacks into feature/add-wear-heart-rate-view

Conflicts:
	mobile/src/main/AndroidManifest.xml