cambios config.xml traidos de twempa
Merge branch 'develop' into staging