listo detalle 1
Merge remote-tracking branch 'origin/master'

Conflicts:
	sites/all/themes/hidrotica/css/global.css
	sites/all/themes/hidrotica/template.php