Css
Merge remote-tracking branch 'origin/master'

Conflicts:
	sites/all/themes/orbelink/css/global.css
	sites/default/files/styles/slider-blog/public/blog-2-prueba.jpg
	sites/default/files/styles/slider-blog/public/blog-3-prueba.jpg
	sites/default/files/styles/slider-blog/public/blog-4-prueba.jpg