comentarios
Merge branch 'master' of https://github.com/keylorm/orbelink

Conflicts:
	sites/all/themes/orbelink/js/global.js
	sites/default/files/styles/slider-blog/public/ima2929.tmp.jpeg
	sites/default/files/styles/slider-blog/public/ima2A72.tmp.gif