update app.php and composer.json for correct merge
Merge branch 'Desarrollo' of github.com:Innodesign/Sistema-Administrativo-Municipal-C.-P.-Boca-del-Rio into Desarrollo