Merge branch_cillesca and branch_mrosalesdiaz into master
Added basic tables and template