UI Changes
Merge branch 'billUI' into passBack

Conflicts:
	res/layout/activity_my_tab.xml