Fixed timeout bug

Fixed a bug where timer for timeout continues to run for an activity
even if the app is at the home screen
Sync
Minor touchups
Merge branch 'New' into Cad-CombinedSchedule

Conflicts:
	GuildWayfinding/bin/GuildWayfinding.apk
	GuildWayfinding/bin/classes.dex
	GuildWayfinding/bin/classes/com/example/guildwayfinding/DBHelper.class

GuildWayfinding/bin/classes/com/example/guildwayfinding/SearchStaffActiv
ity.class
	GuildWayfinding/bin/resources.ap_
	GuildWayfinding/src/com/example/guildwayfinding/AppIntentService.java
	GuildWayfinding/src/com/example/guildwayfinding/DBHelper.java