testing embedly
Merge branch 'master' of https://github.com/colaborativa/huertofuensanta.org

Conflicts:
	_site/templates/templates.html
	templates/templates.html
test