Nuevo SQl
Merge branch 'jd-dev'
Merge branch 'master' of https://github.com/jvrdom/tsi-php