comment out unused function
Merge remote-tracking branch 'origin/master'

Conflicts:
	CollaboRhythm.Hiviva/src/collaboRhythm/hiviva/view/screens/patient/HivivaPatientTakeMedsScreen.as
remote service methods relating to messaging
Merge remote-tracking branch 'origin/master'