app config
Merge branch 'solicitud' into testing