?

??
Merge remote-tracking branch 'origin/master'

Conflicts:
	PanicButton/app/src/main/bin/AndroidManifest.xml
	PanicButton/app/src/main/gen/com/panicbutton/ipmedt4/panicbutton/R.java