Preliminary code for Timeout Feature.
Merge branch 'master' of ssh://git@github.com/nysenate/InventoryMobileApp.git
Deleted commented out code no longer needed.