menu logo
Merge remote-tracking branch 'origin/master'

Conflicts:
	RemoteMedicalDiagnosis/bin/AndroidManifest.xml
	RemoteMedicalDiagnosis/gen/com/viasat/remotemedicaldiagnosis/R.java

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