Cambios Shortcode
Partial
Merge branch 'ricardo' into cesar
Added the google maps
Prepared for QA