Commit android manifest and R.java files so that changes can be pulled.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Added more functionality to the hypertension medication titration app.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Design/UI/CollaboRhythm.Tablet/Hypertension Protocol.ai