Commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	PanicButton/app/src/main/bin/MainActivity.apk
	PanicButton/app/src/main/bin/classes.dex
	PanicButton/app/src/main/bin/classes/com/example/panicbutton/R$id.class
	PanicButton/app/src/main/bin/resources.ap_
	PanicButton/app/src/main/gen/com/example/panicbutton/R.java