Merge pull request #2 from cjc061000/master

probando segundo
tercero
Merge branch 'master' of https://github.com/cjc061000/gis into cjc061000-master
Merge branch 'cjc061000-master'
Merge https://github.com/japuga/gis
Gen ton rec report and cost cont report almost done. User Edit done