knock knock
Merge remote-tracking branch 'origin/master'

Conflicts:
	RemoteMedicalDiagnosis/gen/com/viasat/remotemedicaldiagnosis/R.java
	RemoteMedicalDiagnosis/res/values/strings.xml

	RemoteMedicalDiagnosis/src/com/viasat/remotemedicaldiagnosis/NavigationDrawer.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	RemoteMedicalDiagnosis/AndroidManifest.xml
	RemoteMedicalDiagnosis/bin/AndroidManifest.xml

	RemoteMedicalDiagnosis/bin/res/crunch/drawable-xxhdpi/dark_orange_block.png
	RemoteMedicalDiagnosis/bin/res/crunch/drawable-xxhdpi/green_block.png

	RemoteMedicalDiagnosis/bin/res/crunch/drawable-xxhdpi/light_orange_block.png
	RemoteMedicalDiagnosis/bin/res/crunch/drawable-xxhdpi/red_block.png
	RemoteMedicalDiagnosis/bin/res/crunch/drawable-xxhdpi/yellow_block.png
	RemoteMedicalDiagnosis/gen/com/viasat/remotemedicaldiagnosis/R.java
	RemoteMedicalDiagnosis/res/layout/help.xml
	RemoteMedicalDiagnosis/res/values/strings.xml

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