Added resident medication info screen. No real functionality now besides
some test functionality.
Merge branch 'master' of https://github.com/nutsiepully/medmanage.git

Conflicts:
	AndroidManifest.xml