Final Update for GSoC
final changes
Merge remote-tracking branch 'origin/malaria-setup-screen' into malaria-setup-screen

Conflicts:
	src/com/peacecorps/malaria/MainActivity.java
	src/com/peacecorps/malaria/UserMedicineSettingsFragmentActivity.java