correct manifest
Merge branch 'master' of https://github.com/lucasdai/jedroid_manifest

Conflicts:
	default.xml