slightlty modified manifest
Merge branch 'master' of https://github.com/j-a-c/mdevproject

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
Fixed old commit