Actualización 28-04-2013
Merge branch 'master' of github.com:jimmymata2/proyectos

Conflicts:
	local.lalaguna.com/sites/all/themes/lalaguna/css/global.css.less
	local.lalaguna.com/sites/all/themes/lalaguna/js/lalaguna.js
	local.lalaguna.com/sites/all/themes/lalaguna/templates/nodes/node--article.tpl.php
	local.lalaguna.com/sites/all/themes/lalaguna/templates/pages/page.tpl.php
Actualización 29-04-2013