weeeeeeeee
Merge remote-tracking branch 'origin/master'

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