js
Merge remote-tracking branch 'origin/master'

Conflicts:
	sites/all/themes/orbelink/js/global.js

	sites/default/files/styles/blog_post_populares_view/public/ima2929.tmp.jpeg

	sites/default/files/styles/blog_post_populares_view/public/ima41D1.tmp.jpeg
	sites/default/files/styles/imagen_listado_blog/public/blog-1-prueba.jpg
	sites/default/files/styles/imagen_listado_blog/public/blog-2-prueba.jpg
	sites/default/files/styles/imagen_listado_blog/public/blog-3-prueba.jpg
	sites/default/files/styles/imagen_listado_blog/public/blog-4-prueba.jpg
	sites/default/files/styles/imagen_listado_blog/public/ima41D1.tmp.jpeg
	sites/default/files/styles/imagen_listado_blog/public/imaBC1.tmp.jpeg
	sites/default/files/styles/slider-blog/public/ima41D1.tmp.jpeg
	sites/default/files/styles/slider-blog/public/imaBC1.tmp.jpeg