Merge branch 'master' into slave

Conflicts:
	AndroidManifest.xml
little modifications
Merge branch 'slave'