Base de datos
Merge branch 'master' of https://github.com/chidmdxx/SOFIA.git

Conflicts:
	SOFIA/AndroidManifest.xml
Integration