fix
Merge branch 'improves_v1_5' of https://github.com/glena/datosdemoc into improves_v1_5

Conflicts:
	.gitignore