fixes
Merge remote-tracking branch 'origin/master'

Conflicts:

	RemoteMedicalDiagnosis/src/com/viasat/remotemedicaldiagnosis/NavigationDrawer.java
Merge branch 'master' of https://github.com/kendallhwilson/remotediagnosishackathon

Conflicts:
	RemoteMedicalDiagnosis/gen/com/viasat/remotemedicaldiagnosis/R.java

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