no message
Merge branch 'emergency' of https://github.com/drinkssu/YourVoiceAlarm into emergency

Conflicts:
	.idea/misc.xml
	app/app.iml