change Manifest
Merge branch 'master' of github.com:Vagaweb/VMFCFDM

Conflicts:
	Application/AndroidManifest.xml