Timeout feature implemented for Search and Pickup.
Merge branch 'master' of
ssh://git@github.com/nysenate/InventoryMobileApp.git

Conflicts:
	src/gov/nysenate/inventory/android/Pickup2Activity.java
	src/gov/nysenate/inventory/android/SearchActivity.java