changes to API names
Merge branch 'master' of
ssh://git@github.com/nysenate/InventoryMobileApp.git

Conflicts:
	src/gov/nysenate/inventory/android/Pickup1.java