Fixed Delivery1 "Selected Location Information" box height, set it to
expandable/contractable for height instead of a fixed height.
Fix edit pickup typing crash.

Conflicts:
	src/gov/nysenate/inventory/android/EditPickup1Activity.java
resolve merge conflicts and bumped version code.