Add control to turn torch on and off
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