alarm volume isn't set to full #6 - and also goes back afterwards. We're using the alarm stream
 sound and torch stay active when exiting noise activity #7
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	src/de/adornis/Notifier/NoiseMakerActivity.java