Just so I can merge...
Merge AND fixed getting res meds.

Merge branch 'master' of https://github.com/nutsiepully/medmanage.git

Conflicts:
	AndroidManifest.xml
Innocuous change so I can push.