start of refactor of usage indicator
Merge branch 'master' of github.com:ttcremers/android-memoryloss

Conflicts:
	res/layout/location_picker_list_row.xml