Eliminando plantilla temporal de Cancilleria
Merge branch 'master' of github.com:ananes77/cancilleria

Conflicts:
	sites/all/themes/Cancilleria/style.css