Merge branch 'master' of /home/david/android-studio-projects/FitFactor-Android with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	mobile/src/main/AndroidManifest.xml
	mobile/src/main/java/io/perihelion/fitfactor/MainActivity.java
messaging between watch and phone