Merge branch 'master' of https://github.com/ImTheMark/PHR-Android-HealthGem

Conflicts:
	src/com/example/phr/mobile/daoimpl/MobileBloodPressureDaoImpl.java