shorten phone controls delay
Add control to turn torch on and off
Merge branch 'tidy-up' (hairy merge, I think it worked)

* tidy-up:
  Fixed issue with findViewByID NPEs and issue with alarm screen still visible if alarm killed elsewhere

Conflicts:
	src/org/durka/hallmonitor/DefaultActivity.java
Merge branch 'flashlight' (and twiddle activity_default positioning)

* flashlight:
  Add control to turn torch on and off

Conflicts:
	res/layout/activity_default.xml
	src/org/durka/hallmonitor/DefaultActivity.java
Made torch control optional. Also added check that stock torch app is
installed.
Merge remote-tracking branch 'remotes/upstream/flashlight2'

Conflicts:
	bin/HallMonitor.apk
	res/layout/activity_default.xml
	res/values/strings.xml
	src/org/durka/hallmonitor/ConfigurationFragment.java
	src/org/durka/hallmonitor/DefaultActivity.java
	src/org/durka/hallmonitor/Functions.java