Fixed issue with findViewByID NPEs and issue with alarm screen still
visible if alarm killed elsewhere
Merge remote-tracking branch 'origin/tidy-up'

Conflicts:
	src/org/durka/hallmonitor/DefaultActivity.java