try to work around foreground process dying on history swipe

(does not actually work - Android 4.2.3)
Merge branch 'upstream' into swipe
Show warning message on history swipe, provide context to hockeyapp
Merge branch 'upstream' into swipe

Conflicts:
	res/values/strings.xml
remove duplicate finish
fix foreground service dying on history swipe
missed return after heartbeat handled
wakelock during heartbeat like we did before
ask for a wakeup alarm
Merge branch 'upstream' into swipe

Conflicts:
	src/info/guardianproject/util/Debug.java
move alarm wakeup to UI process

fixed #1927

working around OS killing foreground process that gets an alarm wakeup

possibly relevant material:

http://stackoverflow.com/questions/6645193/foreground-service-being-killed-by-android
https://code.google.com/p/android/issues/detail?id=53313
Merge branch 'swipe' of https://github.com/devrandom/Gibberbot into devrandom-swipe