Integración - SettingsActivity creada.
Merge branch 'master' of https://github.com/chidmdxx/SOFIA.git