Master update
Merge remote-tracking branch 'origin/Dennis'

Conflicts:
	Common/bin/AndroidManifest.xml
	Common/bin/Common.apk
	Common/bin/resources.ap_
Merge branch 'master' into Dennis

Conflicts:
	Common/bin/AndroidManifest.xml
	Common/bin/Common.apk
	Common/bin/resources.ap_
Alles terugzetten