Cleaning code
additions to Delivery3 and changes due to requirements change
Merge branch 'master' of
ssh://git@github.com/nysenate/InventoryMobileApp.git

Conflicts:
	src/gov/nysenate/inventory/android/Pickup3.java
Trying to merge with Brians latest push/commit.
Merge branch 'master' of ssh://github.com/nysenate/InventoryMobileApp

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