agregando mas features
Merge branch 'master' of github.com:GangOfFive/prototipo
agregando campos extra para crear formula
Merge branch 'master' of github.com:GangOfFive/prototipo