Merge branch 'mdpsock' into walkietalkie

Conflicts:
	AndroidManifest.xml
	jni/serval-dna