bloodpressure layout
stuff
Merge branch 'master' of https://github.com/kendallhwilson/remotediagnosishackathon

Conflicts:
	RemoteMedicalDiagnosis/bin/RemoteMedicalDiagnosis.apk
	RemoteMedicalDiagnosis/bin/classes.dex

	RemoteMedicalDiagnosis/bin/dexedLibs/android-support-v4-b7c66d3e7c65aca28765d871d04b61a4.jar
	RemoteMedicalDiagnosis/bin/resources.ap_
	RemoteMedicalDiagnosis/gen/com/viasat/remotemedicaldiagnosis/R.java

	RemoteMedicalDiagnosis/src/com/viasat/remotemedicaldiagnosis/NavigationDrawer.java