DB Funcional
Merge branches 'master' and 'Back' of github.com:monkeythecoder/nuevo_ctin into Back