Css Js Listado
Merge remote-tracking branch 'origin/master'

Conflicts:
	sites/all/themes/orbelink/js/global.js
	sites/default/files/styles/slider-blog/public/imaE0AE.tmp.jpeg
	sites/default/files/styles/slider-blog/public/imaFC6F.tmp.jpg