?

??
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
R Change
R Update
Merge remote-tracking branch 'origin/master'
Aanpassing in androidManifest.xml
Aanpassing in androidManifest.xml
merge probleem
?
Merge remote-tracking branch 'origin/master' into Thierry