change intent filter
456
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	app/src/main/AndroidManifest.xml