Change from Bube to Bubi
Merge branch '24JulyMilestone' of github.com:USM-RCG/openhds-tablet into 24JulyMilestone

Conflicts:
	.idea/workspace.xml