Merge branch 'master' into APKready

Conflicts:
	app/src/main/AndroidManifest.xml